Potato farming

autobuild.xml

@@ -1595,11 +1595,11 @@
             <key>archive</key>
             <map>
               <key>hash</key>
-              <string>e48f291e2eeb1dbab39f26db5ac9b4c2b2d1c57d</string>
+              <string>422b988f8d543a90b9b16f88c7bc2a367e19cdc6</string>
               <key>hash_algorithm</key>
               <string>sha1</string>
               <key>url</key>
-              <string>https://github.com/secondlife/3p-luau/releases/download/v0.638-r2/luau-0.638.0-r2-darwin64-10356321602.tar.zst</string>
+              <string>https://github.com/secondlife/3p-luau/releases/download/v0.654/luau-0.654.0-darwin64-12204676273.tar.zst</string>
             </map>
             <key>name</key>
             <string>darwin64</string>
@@ -1609,11 +1609,11 @@
             <key>archive</key>
             <map>
               <key>hash</key>
-              <string>3a797d8dae685b25ca787111a370b99d9e57d77c</string>
+              <string>2db068085eeefb3c91b28b769a39fa901c4e796a</string>
               <key>hash_algorithm</key>
               <string>sha1</string>
               <key>url</key>
-              <string>https://github.com/secondlife/3p-luau/releases/download/v0.638-r2/luau-0.638.0-r2-linux64-10356321602.tar.zst</string>
+              <string>https://github.com/secondlife/3p-luau/releases/download/v0.654/luau-0.654.0-linux64-12204676273.tar.zst</string>
             </map>
             <key>name</key>
             <string>linux64</string>
@@ -1623,11 +1623,11 @@
             <key>archive</key>
             <map>
               <key>hash</key>
-              <string>a8857313496622134b00899141bbe6542f754164</string>
+              <string>f62eb31ac1a2407033100e424c4b361382c7bc12</string>
               <key>hash_algorithm</key>
               <string>sha1</string>
               <key>url</key>
-              <string>https://github.com/secondlife/3p-luau/releases/download/v0.638-r2/luau-0.638.0-r2-windows64-10356321602.tar.zst</string>
+              <string>https://github.com/secondlife/3p-luau/releases/download/v0.654/luau-0.654.0-windows64-12204676273.tar.zst</string>
             </map>
             <key>name</key>
             <string>windows64</string>

indra/llcommon/llcoros.cpp

@@ -384,11 +384,19 @@ void LLCoros::toplevel(std::string name, callable_t callable)
         // viewer will carry on.
         LOG_UNHANDLED_EXCEPTION("coroutine " + name);
     }
-    catch (...)
+    catch (const std::exception& exc)
     {
         // Stash any OTHER kind of uncaught exception in the rethrow() queue
-        // to be rethrown by the main fiber.
+        // to be rethrown by the main fiber. Report the cause.
         LL_WARNS("LLCoros") << "Capturing uncaught exception in coroutine "
+                            << name << ": " << exc.what() << LL_ENDL;
+        LLCoros::instance().saveException(name, std::current_exception());
+    }
+    catch (...)
+    {
+        // We can't even tell what kind of exception this is. Stash it in the
+        // rethrow() queue to be rethrown by the main fiber.
+        LL_WARNS("LLCoros") << "Capturing unknown uncaught exception in coroutine "
                             << name << LL_ENDL;
         LLCoros::instance().saveException(name, std::current_exception());
     }

indra/llcommon/lua_function.cpp

@@ -796,6 +796,11 @@ LuaState::~LuaState()
 {
     // If we're unwinding the stack due to an exception, don't bother trying
     // to call any callbacks -- either Lua or C++.
+    // TODO: It's a problem that we don't call LL.atexit() functions when the
+    // script is canceled. We use atexit() internally to clean up the
+    // LuaListener, if any, also any ResultSet objects created by the script.
+    // Canceling and then rerunning a script can potentially crash the viewer
+    // due to a dangling LuaListener.
     if (std::uncaught_exceptions() != 0)
         return;
 
@@ -1030,6 +1035,20 @@ void LuaState::check_interrupts_counter()
     }
 }
 
+void LuaState::yield()
+{
+    // We want Lua scripts to call fiber.yield() often to avoid being killed
+    // by our infinite loop detection (above). But calling llcoro::suspend()
+    // every time would be a disincentive, since that actually pauses the C++
+    // coroutine running the Lua script for a frame. This yield() method
+    // judiciously calls llcoro::suspend() when it seems warranted.
+    if (mInterrupts >= INTERRUPTS_MAX_LIMIT/2)
+    {
+        llcoro::suspend();
+        mInterrupts = 0;
+    }
+}
+
 /*****************************************************************************
 *   atexit()
 *****************************************************************************/

indra/llcommon/lua_function.h

@@ -121,6 +121,7 @@ class LuaState
 
     void set_interrupts_counter(S32 counter);
     void check_interrupts_counter();
+    void yield();
 
     int push_debug_traceback();
 

indra/llcommon/scriptcommand.cpp

@@ -35,7 +35,7 @@ ScriptCommand::ScriptCommand(const std::string& command, const LLSD& path,
                                    "\"'",     // either kind of quotes
                                    "\\");     // backslash escape
     // search for args[0] on paths
-    if (search(args[0], path, basepath))
+    if (search(basepath, path, args[0]))
     {
         // The first token is in fact the script filename. Now that we've
         // found the script file, we've consumed that token. The rest are
@@ -48,7 +48,7 @@ ScriptCommand::ScriptCommand(const std::string& command, const LLSD& path,
     // Maybe that's because there are spaces in the original pathname that
     // were neither quoted nor escaped? See if we can find the whole original
     // command line string.
-    if (search(command, path, basepath))
+    if (search(basepath, path, command))
     {
         // Here we found script, using the whole input command line as its
         // pathname. Discard any parts of it we mistook for command-line
@@ -83,34 +83,45 @@ ScriptCommand::ScriptCommand(const std::string& command, const LLSD& path,
     LL_WARNS("Lua") << mError << LL_ENDL;
 }
 
-bool ScriptCommand::search(const fsyspath& script, const LLSD& paths, const fsyspath& base)
+bool ScriptCommand::search(const fsyspath& base, const LLSD& paths, const fsyspath& script)
 {
+    if (! paths.size())
+    {
+        return checkone(base, "", script);
+    }
     for (const auto& path : llsd::inArray(paths))
     {
-        // If a path is already absolute, (otherpath / path) preserves it.
-        // Explicitly instantiate fsyspath for every string conversion to
-        // properly convert UTF-8 filename strings on Windows.
-        fsyspath absscript{ base / fsyspath(path.asString()) / script };
-        bool exists;
-        try
-        {
-            exists = std::filesystem::exists(absscript);
-        }
-        catch (const std::filesystem::filesystem_error& exc)
+        if (checkone(base, path, script))
         {
-            mError = stringize("Can't check existence: ", exc.what());
-            LL_WARNS("Lua") << mError << LL_ENDL;
-            return false;
-        }
-        if (exists)
-        {
-            this->script = absscript.string();
             return true;
         }
     }
     return false;
 }
 
+bool ScriptCommand::checkone(const fsyspath& base, const LLSD& path, const fsyspath& script)
+{
+    // If a path is already absolute, (otherpath / path) preserves it.
+    // Explicitly instantiate fsyspath for every string conversion to
+    // properly convert UTF-8 filename strings on Windows.
+    fsyspath absscript{ base / fsyspath(path.asString()) / script };
+    bool exists;
+    try
+    {
+        exists = std::filesystem::exists(absscript);
+    }
+    catch (const std::filesystem::filesystem_error& exc)
+    {
+        mError = stringize("Can't check existence: ", exc.what());
+        LL_WARNS("Lua") << mError << LL_ENDL;
+        return false;
+    }
+    if (! exists)
+        return false;
+    this->script = absscript.string();
+    return true;
+}
+
 std::string ScriptCommand::error() const
 {
     return mError;

indra/llcommon/scriptcommand.h

@@ -56,7 +56,8 @@ class ScriptCommand
     std::string error() const;
 
 private:
-    bool search(const fsyspath& script, const LLSD& path, const fsyspath& base);
+    bool search(const fsyspath& base, const LLSD& paths, const fsyspath& script);
+    bool checkone(const fsyspath& base, const LLSD& path, const fsyspath& script);
 
     std::string mError;
 };

indra/llcommon/stringize.h

@@ -180,14 +180,4 @@ T destringize(std::basic_string<CHARTYPE> const & str)
     return val;
 }
 
-/**
- * destringize_f(str, functor)
- */
-template <typename CHARTYPE, typename Functor>
-void destringize_f(std::basic_string<CHARTYPE> const & str, Functor const & f)
-{
-    std::basic_istringstream<CHARTYPE> in(str);
-    f(in);
-}
-
 #endif /* ! defined(LL_STRINGIZE_H) */

indra/llui/llluafloater.cpp

@@ -134,6 +134,23 @@ LLLuaFloater::LLLuaFloater(const LLSD &key) :
         setTitle(event["value"].asString());
     }, llsd::map("value", LLSD()));
 
+    mDispatchListener.add("add_item", "", [this](const LLSD &event)
+    {
+        LLComboBox *ctrl = getChild<LLComboBox>(event["ctrl_name"].asString());
+        if(ctrl)
+        {
+            ctrl->add(event["name"].asString(), event["value"]);
+        }
+    }, requiredParams);
+    mDispatchListener.add("select_by_value", "", [this](const LLSD &event)
+    {
+        LLComboBox *ctrl = getChild<LLComboBox>(event["ctrl_name"].asString());
+        if(ctrl)
+        {
+            ctrl->setSelectedByValue(event["value"], true);
+        }
+    }, requiredParams);
+
     mDispatchListener.add("get_value", "", [ctrl_lookup](const LLSD &event)
     {
         return ctrl_lookup(event, [](LLUICtrl *ctrl, const LLSD &event) { return llsd::map("value", ctrl->getValue()); });

indra/newview/llappviewerlistener.cpp

@@ -35,6 +35,7 @@
 // external library headers
 // other Linden headers
 #include "llappviewer.h"
+#include "llviewerstats.h"
 #include "workqueue.h"
 
 LLAppViewerListener::LLAppViewerListener(const LLAppViewerGetter& getter):
@@ -52,6 +53,10 @@ LLAppViewerListener::LLAppViewerListener(const LLAppViewerGetter& getter):
     add("forceQuit",
         "Quit abruptly",
         &LLAppViewerListener::forceQuit);
+
+    add("resetFrameStats",
+        "Reset frame related stats",
+        &LLAppViewerListener::resetFrameStats);
 }
 
 void LLAppViewerListener::userQuit(const LLSD& event)
@@ -77,3 +82,8 @@ void LLAppViewerListener::forceQuit(const LLSD& event)
     LL::WorkQueue::getInstance("mainloop")->post(
         [appviewer=mAppViewerGetter()]{ appviewer->forceQuit(); });
 }
+
+void LLAppViewerListener::resetFrameStats(const LLSD& event)
+{
+    LLViewerStats::instance().resetFrameStats();
+}

indra/newview/llappviewerlistener.h

@@ -47,6 +47,7 @@ class LLAppViewerListener: public LLEventAPI
     void userQuit(const LLSD& event);
     void requestQuit(const LLSD& event);
     void forceQuit(const LLSD& event);
+    void resetFrameStats(const LLSD& event);
 
     LLAppViewerGetter mAppViewerGetter;
 };

indra/newview/llfloaterpreference.cpp

@@ -1099,6 +1099,12 @@ void LLFloaterPreference::refreshEnabledGraphics()
     }
 }
 
+void LLFloaterPreference::setGraphicsQuality(U32 level)
+{
+    LLFeatureManager::getInstance()->setGraphicsLevel(level, true);
+    refreshEnabledGraphics();
+}
+
 void LLFloaterPreference::onClickClearCache()
 {
     LLNotificationsUtil::add("ConfirmClearCache", LLSD(), LLSD(), callback_clear_cache);
@@ -1362,10 +1368,7 @@ void LLFloaterPreference::onCommitWindowedMode()
 
 void LLFloaterPreference::onChangeQuality(const LLSD& data)
 {
-    U32 level = (U32)data.asReal();
-    LLFeatureManager::getInstance()->setGraphicsLevel(level, true);
-    refreshEnabledGraphics();
-    refresh();
+    setGraphicsQuality((U32)data.asReal());
 }
 
 void LLFloaterPreference::onClickSetSounds()

indra/newview/llfloaterpreference.h

@@ -106,6 +106,8 @@ class LLFloaterPreference : public LLFloater, public LLAvatarPropertiesObserver,
     // update Show Favorites checkbox
     static void updateShowFavoritesCheckbox(bool val);
 
+    static void setGraphicsQuality(U32 level);
+
     void processProperties( void* pData, EAvatarProcessorType type ) override;
     void saveAvatarProperties( void );
     static void saveAvatarPropertiesCoro(const std::string url, bool allow_publish);

indra/newview/llluamanager.cpp

@@ -53,15 +53,11 @@ S32 LLLUAmanager::sAutorunScriptCount = 0;
 S32 LLLUAmanager::sScriptCount = 0;
 std::map<std::string, std::string> LLLUAmanager::sScriptNames;
 
-lua_function(sleep, "sleep(seconds): pause the running coroutine")
+lua_function(yield, "yield(): allow other processing to run.")
 {
-    lua_checkdelta(L, -1);
-    lua_Number seconds = lua_tonumber(L, -1);
-    lua_pop(L, 1);
-    llcoro::suspendUntilTimeout(narrow(seconds));
-    LuaState::getParent(L).set_interrupts_counter(0);
+    LuaState::getParent(L).yield();
     return 0;
-};
+}
 
 // This function consumes ALL Lua stack arguments and returns concatenated
 // message string
@@ -344,7 +340,7 @@ void LLRequireResolver::findModule()
     }
 
     LLSD lib_paths(gSavedSettings.getLLSD("LuaRequirePath"));
-    LL_DEBUGS("Lua") << "LuaRequirePath = " << lib_paths << LL_ENDL;
+    LL_DEBUGS_ONCE("Lua") << "LuaRequirePath = " << lib_paths << LL_ENDL;
     for (const auto& path : llsd::inArray(lib_paths))
     {
         // if path is already absolute, operator/() preserves it