Merge branch 'release/luau-scripting' into lua-login

2 files changed, 4 insertions, 11 deletions

diff --git a/indra/newview/scripts/lua/LLDebugSettings.lua b/indra/newview/scripts/lua/LLDebugSettings.lua
index c1d74fe00a..c250019a00 100644
--- a/indra/newview/scripts/lua/LLDebugSettings.lua
+++ b/indra/newview/scripts/lua/LLDebugSettings.lua
@@ -1,24 +1,17 @@
 leap = require 'leap'
 
-local function check_response(res)
-  if res.error then
-    error(res.error)
-  end
-  return res
-end
-
 local LLDebugSettings = {}
 
 function LLDebugSettings.set(name, value)
-    check_response(leap.request('LLViewerControl', {op='set', group='Global', key=name, value=value}))
+    leap.request('LLViewerControl', {op='set', group='Global', key=name, value=value})
 end
 
 function LLDebugSettings.toggle(name)
-    check_response(leap.request('LLViewerControl', {op='toggle', group='Global', key=name}))
+    leap.request('LLViewerControl', {op='toggle', group='Global', key=name})
 end
 
 function LLDebugSettings.get(name)
-    return check_response(leap.request('LLViewerControl', {op='get', group='Global', key=name}))['value']
+    return leap.request('LLViewerControl', {op='get', group='Global', key=name})['value']
 end
 
 return LLDebugSettings
diff --git a/indra/newview/scripts/lua/UI.lua b/indra/newview/scripts/lua/UI.lua
index f851632bad..24f822bbd9 100644
--- a/indra/newview/scripts/lua/UI.lua
+++ b/indra/newview/scripts/lua/UI.lua
@@ -6,7 +6,7 @@ local UI = {}
 
 function UI.call(func, parameter)
     -- 'call' is fire-and-forget
-    leap.send('UI', {op='call', ['function']=func, parameter=parameter})
+    leap.request('UI', {op='call', ['function']=func, parameter=parameter})
 end
 
 function UI.getValue(path)