summaryrefslogtreecommitdiff
path: root/indra/newview/llfloaterluascripts.cpp
diff options
context:
space:
mode:
authorNat Goodspeed <nat@lindenlab.com>2024-06-11 10:07:05 -0400
committerNat Goodspeed <nat@lindenlab.com>2024-06-11 10:07:05 -0400
commitde037486613d9560f3a9835621ef35e6fcc77378 (patch)
treea5ada9ac285f3d84f99e91f2e41a4c062691145e /indra/newview/llfloaterluascripts.cpp
parentf8b1823c8a2ae2ec139d5a4f5dd1f50f9f0f6ad0 (diff)
parent3d1aac4f5c369e9d402c41f1c790d9015f7c7773 (diff)
Merge branch 'release/luau-scripting' into lua-login
Diffstat (limited to 'indra/newview/llfloaterluascripts.cpp')
-rw-r--r--indra/newview/llfloaterluascripts.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/indra/newview/llfloaterluascripts.cpp b/indra/newview/llfloaterluascripts.cpp
index 39d5816b0d..189ee0c9d1 100644
--- a/indra/newview/llfloaterluascripts.cpp
+++ b/indra/newview/llfloaterluascripts.cpp
@@ -41,22 +41,22 @@ LLFloaterLUAScripts::LLFloaterLUAScripts(const LLSD &key)
mUpdateTimer(new LLTimer()),
mContextMenuHandle()
{
- mCommitCallbackRegistrar.add("Script.OpenFolder", [this](LLUICtrl*, const LLSD &userdata)
+ mCommitCallbackRegistrar.add("Script.OpenFolder", {[this](LLUICtrl*, const LLSD &userdata)
{
if (mScriptList->hasSelectedItem())
{
std::string target_folder_path = std::filesystem::path((mScriptList->getFirstSelected()->getColumn(1)->getValue().asString())).parent_path().string();
gViewerWindow->getWindow()->openFolder(target_folder_path);
}
- });
- mCommitCallbackRegistrar.add("Script.Terminate", [this](LLUICtrl*, const LLSD &userdata)
+ }, cb_info::UNTRUSTED_BLOCK });
+ mCommitCallbackRegistrar.add("Script.Terminate", {[this](LLUICtrl*, const LLSD &userdata)
{
if (mScriptList->hasSelectedItem())
{
std::string coro_name = mScriptList->getSelectedValue();
LLCoros::instance().killreq(coro_name);
}
- });
+ }, cb_info::UNTRUSTED_BLOCK });
}