Merge pull request #2722 from secondlife/maxim/lua-uicallback-invoke

Add UI callback to invoke specified script via menu

2 files changed, 39 insertions, 5 deletions

diff --git a/indra/newview/llviewermenu.cpp b/indra/newview/llviewermenu.cpp
index 2f5a302b3f..2d94b4da9f 100644
--- a/indra/newview/llviewermenu.cpp
+++ b/indra/newview/llviewermenu.cpp
@@ -78,6 +78,7 @@
 #include "llfloatertools.h"
 #include "llfloaterworldmap.h"
 #include "llfloaterbuildoptions.h"
+#include "fsyspath.h"
 #include "llavataractions.h"
 #include "lllandmarkactions.h"
 #include "llgroupmgr.h"
@@ -90,6 +91,7 @@
 #include "llinventorybridge.h"
 #include "llinventorydefines.h"
 #include "llinventoryfunctions.h"
+#include "llluamanager.h"
 #include "llpanellogin.h"
 #include "llpanelblockedlist.h"
 #include "llpanelmaininventory.h"
@@ -9461,6 +9463,18 @@ void LLUploadCostCalculator::calculateCost(const std::string& asset_type_str)
     mCostStr = std::to_string(upload_cost);
 }
 
+void lua_run_script(const LLSD& userdata)
+{
+    std::string script_path = userdata.asString();
+    if (script_path.empty())
+    {
+        LL_WARNS() << "Script name is not specified" << LL_ENDL;
+        return;
+    }
+
+    LLLUAmanager::runScriptFile(script_path);
+}
+
 void show_navbar_context_menu(LLView* ctrl, S32 x, S32 y)
 {
     static LLMenuGL*    show_navbar_context_menu = LLUICtrlFactory::getInstance()->createFromFile<LLMenuGL>("menu_hide_navbar.xml",
@@ -10062,4 +10076,6 @@ void initialize_menus()
     view_listener_t::addMenu(new LLEditableSelected(), "EditableSelected");
     view_listener_t::addMenu(new LLEditableSelectedMono(), "EditableSelectedMono");
     view_listener_t::addMenu(new LLToggleUIHints(), "ToggleUIHints");
+
+    registrar.add("Lua.RunScript", boost::bind(&lua_run_script, _2), cb_info::UNTRUSTED_BLOCK);
 }
diff --git a/indra/newview/scripts/lua/test_top_menu.lua b/indra/newview/scripts/lua/test_top_menu.lua
index 780a384c92..f877cda5eb 100644
--- a/indra/newview/scripts/lua/test_top_menu.lua
+++ b/indra/newview/scripts/lua/test_top_menu.lua
@@ -18,17 +18,35 @@ UI.addMenuItem{name="lua_scripts",label="Scripts",
 --Add menu separator to the 'LUA Menu' under added menu items
 UI.addMenuSeparator{parent_menu=MENU_NAME}
 
---Add two new menu branch 'About...' to the 'LUA Menu'
-local BRANCH_NAME = "about_branch"
-UI.addMenuBranch{name="about_branch",label="About...",parent_menu=MENU_NAME}
+--Add 'Demo scripts...' branch to the 'LUA Menu'
+local DEMO_BRANCH = "demo_scripts"
+UI.addMenuBranch{name=DEMO_BRANCH,label="Demo scripts...",parent_menu=MENU_NAME}
+
+--Add menu items to the 'Demo scripts...' branch, which will invoke specified script on click
+UI.addMenuItem{name="speedometer",label="Speedometer",
+                param="test_luafloater_speedometer.lua",
+                func="Lua.RunScript",
+                parent_menu=DEMO_BRANCH}
+
+UI.addMenuItem{name="gesture_list",label="Gesture list",
+                param="test_luafloater_gesture_list.lua",
+                func="Lua.RunScript",
+                parent_menu=DEMO_BRANCH}
+
+--Add one more menu separator
+UI.addMenuSeparator{parent_menu=MENU_NAME}
+
+--Add 'About...' branch to the 'LUA Menu'
+local ABOUT_BRANCH = "about_branch"
+UI.addMenuBranch{name=ABOUT_BRANCH,label="About...",parent_menu=MENU_NAME}
 
 --Add two new menu items to the 'About...' branch
 UI.addMenuItem{name="lua_info",label="Lua...",
                 param="https://www.lua.org/about.html",
                 func="Advanced.ShowURL",
-                parent_menu=BRANCH_NAME}
+                parent_menu=ABOUT_BRANCH}
 
 UI.addMenuItem{name="lua_info",label="Luau...",
                 param="https://luau-lang.org/",
                 func="Advanced.ShowURL",
-                parent_menu=BRANCH_NAME}
+                parent_menu=ABOUT_BRANCH}