Merge branch 'lua-ui-callbacks' into release/luau-scripting

1 files changed, 7 insertions, 4 deletions

diff --git a/indra/llui/llmenugl.h b/indra/llui/llmenugl.h
index e8d6043e54..708010a067 100644
--- a/indra/llui/llmenugl.h
+++ b/indra/llui/llmenugl.h
@@ -950,16 +950,19 @@ public:
         LLUICtrl::EnableCallbackRegistry::currentRegistrar().add(name, boost::bind(&view_listener_t::handleEvent, listener, _2));
     }
 
-    static void addCommit(view_listener_t* listener, const std::string& name)
+    static void addCommit(view_listener_t *listener, const std::string &name, 
+        LLUICtrl::LLCommitCallbackInfo::EUntrustedCall handle_untrusted = LLUICtrl::LLCommitCallbackInfo::UNTRUSTED_BLOCK)
     {
-        LLUICtrl::CommitCallbackRegistry::currentRegistrar().add(name, boost::bind(&view_listener_t::handleEvent, listener, _2));
+        LLUICtrl::SharedCommitCallbackRegistry::currentRegistrar().add(name, 
+            LLUICtrl::LLCommitCallbackInfo(boost::bind(&view_listener_t::handleEvent, listener, _2), handle_untrusted));
     }
 
-    static void addMenu(view_listener_t* listener, const std::string& name)
+    static void addMenu(view_listener_t *listener, const std::string &name, 
+        LLUICtrl::LLCommitCallbackInfo::EUntrustedCall handle_untrusted = LLUICtrl::LLCommitCallbackInfo::UNTRUSTED_BLOCK)
     {
         // For now, add to both click and enable registries
         addEnable(listener, name);
-        addCommit(listener, name);
+        addCommit(listener, name, handle_untrusted);
     }
 
     static void cleanup()