diff options
| author | nat-goodspeed <nat@lindenlab.com> | 2024-02-09 12:18:03 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-02-09 12:18:03 -0500 |
| commit | d164f1c929f5be220a48085faccd861189469fc3 (patch) | |
| tree | c9f38063e7e1731de9f803b812c9e1ca588fa0b5 /indra | |
| parent | 629aff3a53d887fcc83c39ce5f757e0142d6090a (diff) | |
| parent | 8f9acfd71f7cc2b6295404c8fb270bb4b83f5626 (diff) | |
Merge pull request #23 from secondlife/console-persist
Make LLFloaterLUADebug store a persistent LuaState.
Diffstat (limited to 'indra')
| -rw-r--r-- | indra/newview/llfloaterluadebug.cpp | 4 | ||||
| -rw-r--r-- | indra/newview/llfloaterluadebug.h | 2 |
2 files changed, 4 insertions, 2 deletions
diff --git a/indra/newview/llfloaterluadebug.cpp b/indra/newview/llfloaterluadebug.cpp index b2c001817f..d7b46eaa71 100644 --- a/indra/newview/llfloaterluadebug.cpp +++ b/indra/newview/llfloaterluadebug.cpp @@ -77,7 +77,7 @@ void LLFloaterLUADebug::onExecuteClicked() mResultOutput->setValue(""); std::string cmd = mLineInput->getText(); - LLLUAmanager::runScriptLine(cmd, [this](int count, const LLSD& result) + LLLUAmanager::runScriptLine(mState, cmd, [this](int count, const LLSD& result) { completion(count, result); }); @@ -107,7 +107,7 @@ void LLFloaterLUADebug::runSelectedScript(const std::vector<std::string> &filena if (!filepath.empty()) { mScriptPath->setText(filepath); - LLLUAmanager::runScriptFile(filepath, [this](int count, const LLSD& result) + LLLUAmanager::runScriptFile(mState, filepath, [this](int count, const LLSD& result) { completion(count, result); }); diff --git a/indra/newview/llfloaterluadebug.h b/indra/newview/llfloaterluadebug.h index 2dc59c5894..69b334ae2d 100644 --- a/indra/newview/llfloaterluadebug.h +++ b/indra/newview/llfloaterluadebug.h @@ -28,6 +28,7 @@ #include "llevents.h" #include "llfloater.h" +#include "lua_function.h" extern "C" { @@ -63,6 +64,7 @@ private: LLTextEditor* mResultOutput; LLLineEditor* mLineInput; LLLineEditor* mScriptPath; + LuaState mState; }; #endif // LL_LLFLOATERLUADEBUG_H |