diff options
author | Nat Goodspeed <nat@lindenlab.com> | 2024-09-04 09:41:39 -0400 |
---|---|---|
committer | Nat Goodspeed <nat@lindenlab.com> | 2024-09-04 09:41:39 -0400 |
commit | fe2b1b8a80abceada50e5801dbe4ff5ed781bff1 (patch) | |
tree | ae07c021b49b94ebc1fe718a162b61bd105aebfb /indra/newview/llluamanager.h | |
parent | d67ad5da3b5a37f7b4cb78e686ae36f31c513153 (diff) | |
parent | 487973d3f0ee9b8583b3d977ca6a405cba5fe518 (diff) |
Merge branch 'release/luau-scripting' into lua-resultset
Diffstat (limited to 'indra/newview/llluamanager.h')
-rw-r--r-- | indra/newview/llluamanager.h | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/indra/newview/llluamanager.h b/indra/newview/llluamanager.h index 50f922a80f..309cb87cac 100644 --- a/indra/newview/llluamanager.h +++ b/indra/newview/llluamanager.h @@ -58,7 +58,7 @@ public: // same semantics as script_result_fn parameters typedef std::pair<int, LLSD> script_result; - static void runScriptFile(const std::string &filename, script_result_fn result_cb = {}, + static void runScriptFile(const std::string &filename, bool autorun = false, script_result_fn result_cb = {}, script_finished_fn finished_cb = {}); // Start running a Lua script file, returning an LLCoros::Future whose // get() method will pause the calling coroutine until it can deliver the @@ -84,6 +84,9 @@ public: static const std::map<std::string, std::string> getScriptNames() { return sScriptNames; } + static S32 sAutorunScriptCount; + static S32 sScriptCount; + private: static std::map<std::string, std::string> sScriptNames; }; |