8 files changed, 101 insertions, 16 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
 -- ***************************************************************************
diff --git a/indra/newview/scripts/lua/require/UI.lua b/indra/newview/scripts/lua/require/UI.lua
index cf2695917e..34f3fb75eb 100644
--- a/indra/newview/scripts/lua/require/UI.lua
+++ b/indra/newview/scripts/lua/require/UI.lua
@@ -222,8 +222,10 @@ function UI.hideFloater(floater_name)
     leap.send("LLFloaterReg", {op = "hideInstance", name = floater_name})
 end
 
-function UI.toggleFloater(floater_name)
-    leap.send("LLFloaterReg", {op = "toggleInstance", name = floater_name})
+function UI.toggleFloater(...)
+    local args = mapargs('name,key', ...)
+    args.op = 'toggleInstance'
+    leap.send("LLFloaterReg", args)
 end
 
 function UI.isFloaterVisible(floater_name)
diff --git a/indra/newview/scripts/lua/test_LLChatListener.lua b/indra/newview/scripts/lua/test_LLChatListener.lua
index 0f269b54e6..fa00b048b2 100644
--- a/indra/newview/scripts/lua/test_LLChatListener.lua
+++ b/indra/newview/scripts/lua/test_LLChatListener.lua
@@ -1,5 +1,6 @@
-local LLListener = require 'LLListener'
+local LLAgent = require 'LLAgent'
 local LLChat = require 'LLChat'
+local LLListener = require 'LLListener'
 local UI = require 'UI'
 
 -- Chat listener script allows to use the following commands in Nearby chat:
@@ -23,9 +24,13 @@ function openOrEcho(message)
 end
 
 local listener = LLListener(LLChat.nearbyChatPump)
+local agent_id = LLAgent.getID()
 
 function listener:handleMessages(event_data)
-    if string.find(event_data.message, '[LUA]') then
+    -- ignore messages and commands from other avatars
+    if event_data.from_id ~= agent_id then
+      return true
+    elseif string.find(event_data.message, '[LUA]') then
       return true
     elseif event_data.message == 'stop' then
       LLChat.sendNearby('Closing echo script.')
diff --git a/indra/newview/scripts/lua/test_animation.lua b/indra/newview/scripts/lua/test_animation.lua
index 37e7254a6c..ae5eabe148 100644
--- a/indra/newview/scripts/lua/test_animation.lua
+++ b/indra/newview/scripts/lua/test_animation.lua
@@ -7,8 +7,8 @@ animations_id = LLInventory.getBasicFolderID('animatn')
 anims = LLInventory.collectDescendentsIf{folder_id=animations_id, type="animatn"}.items
 
 local anim_ids = {}
-for key in pairs(anims) do
-    table.insert(anim_ids, key)
+for _, key in pairs(anims) do
+    table.insert(anim_ids, {id = key.id, name = key.name})
 end
 
 if #anim_ids == 0 then
@@ -16,17 +16,17 @@ if #anim_ids == 0 then
 else
     -- Start playing a random animation
     math.randomseed(os.time())
-    local random_id = anim_ids[math.random(#anim_ids)]
-    local anim_info = LLAgent.getAnimationInfo(random_id)
+    local random_anim = anim_ids[math.random(#anim_ids)]
+    local anim_info = LLAgent.getAnimationInfo(random_anim.id)
 
-    print("Starting animation locally: " .. anims[random_id].name)
-    print("Loop: " .. anim_info.is_loop .. " Joints: " .. anim_info.num_joints .. " Duration " .. tonumber(string.format("%.2f", anim_info.duration)))
-    LLAgent.playAnimation{item_id=random_id}
+    print("Starting animation locally: " .. random_anim.name)
+    print("Loop: " .. tostring(anim_info.is_loop) .. " Joints: " .. anim_info.num_joints .. " Duration " .. tonumber(string.format("%.2f", anim_info.duration)))
+    LLAgent.playAnimation{item_id=random_anim.id}
 
     -- Stop animation after 3 sec if it's looped or longer than 3 sec
-    if anim_info.is_loop == 1 or anim_info.duration > 3 then
+    if anim_info.is_loop or anim_info.duration > 3 then
         LL.sleep(3)
         print("Stop animation.")
-        LLAgent.stopAnimation(random_id)
+        LLAgent.stopAnimation(random_anim.id)
     end
 end
diff --git a/indra/newview/scripts/lua/test_luafloater_demo.lua b/indra/newview/scripts/lua/test_luafloater_demo.lua
index 2158134511..23310c6176 100644
--- a/indra/newview/scripts/lua/test_luafloater_demo.lua
+++ b/indra/newview/scripts/lua/test_luafloater_demo.lua
@@ -14,7 +14,7 @@ function flt:handleEvents(event_data)
 end
 
 function flt:commit_disable_ctrl(event_data)
-    self:post({action="set_enabled", ctrl_name="open_btn", value = (1 - event_data.value)})
+    self:post({action="set_enabled", ctrl_name="open_btn", value = not event_data.value})
 end
 
 function flt:commit_title_cmb(event_data)
diff --git a/indra/newview/scripts/lua/test_nearby_avatars.lua b/indra/newview/scripts/lua/test_nearby_avatars.lua
new file mode 100644
index 0000000000..c7fa686076
--- /dev/null
+++ b/indra/newview/scripts/lua/test_nearby_avatars.lua
@@ -0,0 +1,25 @@
+inspect = require 'inspect'
+LLAgent = require 'LLAgent'
+
+-- Get the list of nearby avatars and print the info
+local nearby_avatars = LLAgent.getNearbyAvatarsList()
+if nearby_avatars.result.length == 0 then
+    print("No avatars nearby")
+else
+    print("Nearby avatars:")
+    for _, av in pairs(nearby_avatars.result) do
+        print(av.name ..' ID: ' .. av.id ..' Global pos:' .. inspect(av.global_pos))
+    end
+end
+
+-- Get the list of nearby objects in 3m range and print the info
+local nearby_objects = LLAgent.getNearbyObjectsList(3)
+if nearby_objects.result.length == 0 then
+    print("No objects nearby")
+else
+    print("Nearby objects:")
+    local pos={}
+    for _, obj in pairs(nearby_objects.result) do
+      print('ID: ' .. obj.id ..' Global pos:' .. inspect(obj.global_pos))
+    end
+end
diff --git a/indra/newview/scripts/lua/test_screen_position.lua b/indra/newview/scripts/lua/test_screen_position.lua
new file mode 100644
index 0000000000..94d57339b1
--- /dev/null
+++ b/indra/newview/scripts/lua/test_screen_position.lua
@@ -0,0 +1,8 @@
+LLAgent = require 'LLAgent'
+
+local screen_pos = LLAgent.getAgentScreenPos()
+if screen_pos.onscreen then
+  print("Avatar screen coordinates X: " .. screen_pos.x .. " Y: " .. screen_pos.y)
+else
+  print("Avatar is not on the screen")
+end
diff --git a/indra/newview/scripts/lua/test_toolbars.lua b/indra/newview/scripts/lua/test_toolbars.lua
index 7683fca8a3..9cd1043446 100644
--- a/indra/newview/scripts/lua/test_toolbars.lua
+++ b/indra/newview/scripts/lua/test_toolbars.lua
@@ -20,7 +20,7 @@ if response == 'OK' then
         UI.removeToolbarBtn(BUTTONS[i])
       end
     end
-    popup:tip('Toolbars were reshuffled')
+    UI.popup:tip('Toolbars were reshuffled')
 else
-    popup:tip('Canceled')
+    UI.popup:tip('Canceled')
 end