diff options
author | Merov Linden <merov@lindenlab.com> | 2013-10-28 12:14:27 -0700 |
---|---|---|
committer | Merov Linden <merov@lindenlab.com> | 2013-10-28 12:14:27 -0700 |
commit | 026b528b86a853a923ec87dd3897fe2079cbd539 (patch) | |
tree | b31ec200f751a5c0817a6e628ae6e6c4f394bf77 /indra/newview/skins/default/xui/en/menu_people_nearby.xml | |
parent | ee74eb1a9ee8e2aba49613cf434f1272a4526417 (diff) | |
parent | ea1e1b0925b386cf83178539b8eae9e25c573548 (diff) |
Pull merge from lindenlab/viewer-release
Diffstat (limited to 'indra/newview/skins/default/xui/en/menu_people_nearby.xml')
-rwxr-xr-x | indra/newview/skins/default/xui/en/menu_people_nearby.xml | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/indra/newview/skins/default/xui/en/menu_people_nearby.xml b/indra/newview/skins/default/xui/en/menu_people_nearby.xml index 3abb5f7bc8..f12226ebeb 100755 --- a/indra/newview/skins/default/xui/en/menu_people_nearby.xml +++ b/indra/newview/skins/default/xui/en/menu_people_nearby.xml @@ -29,6 +29,15 @@ parameter="can_offer_teleport"/> </menu_item_call> <menu_item_call + label="Request Teleport" + name="request_teleport"> + <menu_item_call.on_click + function="Avatar.TeleportRequest"/> + <menu_item_call.on_enable + function="Avatar.EnableItem" + parameter="can_offer_teleport"/> + </menu_item_call> + <menu_item_call label="Voice call" layout="topleft" name="voice_call"> @@ -134,5 +143,4 @@ function="Avatar.EnableItem" parameter="can_block" /> </menu_item_check> - <menu_item_separator /> </context_menu> |