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

3 files changed, 14 insertions, 12 deletions

diff --git a/indra/newview/scripts/lua/LLDebugSettings.lua b/indra/newview/scripts/lua/LLDebugSettings.lua
index c1d74fe00a..06a8a63727 100644
--- a/indra/newview/scripts/lua/LLDebugSettings.lua
+++ b/indra/newview/scripts/lua/LLDebugSettings.lua
@@ -1,24 +1,18 @@
 leap = require 'leap'
-
-local function check_response(res)
-  if res.error then
-    error(res.error)
-  end
-  return res
-end
+util = require 'util'
 
 local LLDebugSettings = {}
 
 function LLDebugSettings.set(name, value)
-    check_response(leap.request('LLViewerControl', {op='set', group='Global', key=name, value=value}))
+    util.check_response(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}))
+    util.check_response(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 util.check_response(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..6101c7a312 100644
--- a/indra/newview/scripts/lua/UI.lua
+++ b/indra/newview/scripts/lua/UI.lua
@@ -1,16 +1,17 @@
 -- Engage the UI LLEventAPI
 
 leap = require 'leap'
+util = require 'util'
 
 local UI = {}
 
 function UI.call(func, parameter)
     -- 'call' is fire-and-forget
-    leap.send('UI', {op='call', ['function']=func, parameter=parameter})
+    util.check_response(leap.request('UI', {op='call', ['function']=func, parameter=parameter}))
 end
 
 function UI.getValue(path)
-    return leap.request('UI', {op='getValue', path=path})['value']
+    return util.check_response(leap.request('UI', {op='getValue', path=path}))['value']
 end
 
 return UI
diff --git a/indra/newview/scripts/lua/util.lua b/indra/newview/scripts/lua/util.lua
index a2191288f6..404efdf09e 100644
--- a/indra/newview/scripts/lua/util.lua
+++ b/indra/newview/scripts/lua/util.lua
@@ -41,4 +41,11 @@ function util.equal(t1, t2)
     return util.empty(temp)
 end
 
+function util.check_response(res)
+  if res.error then
+    error(res.error)
+  end
+  return res
+end
+
 return util