Merge branch 'develop' into marchcat/c-develop

# Conflicts:
#	indra/llwindow/llwindowwin32.cpp
#	indra/newview/skins/default/xui/en/floater_inventory_item_properties.xml

1 files changed, 45 insertions, 0 deletions

diff --git a/indra/newview/scripts/lua/require/LLAgent.lua b/indra/newview/scripts/lua/require/LLAgent.lua
index 4a1132fe7e..6068a916ed 100644
--- a/indra/newview/scripts/lua/require/LLAgent.lua
+++ b/indra/newview/scripts/lua/require/LLAgent.lua
@@ -1,8 +1,26 @@
 local leap = require 'leap'
 local mapargs = require 'mapargs'
+local result_view = require 'result_view'
+
+local function result(keys)
+    local result_table = {
+        result=result_view(keys.result),
+        -- call result_table:close() to release result sets before garbage
+        -- collection or script completion
+        close = function(self)
+            result_view.close(keys.result[1])
+        end
+    }
+    -- When the result_table is destroyed, close its result_views.
+    return LL.setdtor('LLAgent result', result_table, result_table.close)
+end
 
 local LLAgent = {}
 
+function LLAgent.getID()
+    return leap.request('LLAgent', {op = 'getID'}).id
+end
+
 function LLAgent.getRegionPosition()
     return leap.request('LLAgent', {op = 'getPosition'}).region
 end
@@ -95,6 +113,33 @@ function LLAgent.requestStand()
     leap.send('LLAgent', {op = 'requestStand'})
 end
 
+-- Get the nearby avatars in a range of provided "dist",
+-- if "dist" is not specified, "RenderFarClip" setting is used
+-- reply will contain "result" table with following fields:
+-- "id", "global_pos", "region_pos",  "name", "region_id"
+function LLAgent.getNearbyAvatarsList(...)
+    local args = mapargs('dist', ...)
+    args.op = 'getNearbyAvatarsList'
+    return result(leap.request('LLAgent', args))
+end
+
+-- reply will contain "result" table with following fields:
+-- "id", "global_pos", "region_pos", "region_id"
+function LLAgent.getNearbyObjectsList(...)
+    local args = mapargs('dist', ...)
+    args.op = 'getNearbyObjectsList'
+    return result(leap.request('LLAgent', args))
+end
+
+-- Get screen position of your own avatar or any other (if "avatar_id" is specified)
+-- reply contains "x", "y" coordinates and "onscreen" flag to indicate if it's actually in within the current window
+-- avatar render position is used as the point
+function LLAgent.getAgentScreenPos(...)
+    local args = mapargs('avatar_id', ...)
+    args.op = 'getAgentScreenPos'
+    return leap.request('LLAgent', args)
+end
+
 -- ***************************************************************************
 --  Autopilot
 -- ***************************************************************************