summaryrefslogtreecommitdiff
path: root/indra/newview/skins/default
diff options
context:
space:
mode:
authorLeyla Farazha <leyla@lindenlab.com>2010-01-04 14:04:20 -0800
committerLeyla Farazha <leyla@lindenlab.com>2010-01-04 14:04:20 -0800
commitfbac3aaf0c43de4892ab0b95540f86c2b7c7a0de (patch)
tree0a43aa882504a4ca96ea28a60e5f076279dae4b3 /indra/newview/skins/default
parent0d14e65c2deb7b99d1459a75ee080f786850ceb0 (diff)
EXT-2481 [BSI] Add "Zoom in" to 3D Object context menu and inspector Gear menu
EXT-3388 [BSI] "Teleport" option missing dropdown when right clicking on friends list
Diffstat (limited to 'indra/newview/skins/default')
-rw-r--r--indra/newview/skins/default/xui/en/menu_avatar_other.xml6
-rw-r--r--indra/newview/skins/default/xui/en/menu_object.xml6
2 files changed, 12 insertions, 0 deletions
diff --git a/indra/newview/skins/default/xui/en/menu_avatar_other.xml b/indra/newview/skins/default/xui/en/menu_avatar_other.xml
index 0ad41546d2..78f057a7d7 100644
--- a/indra/newview/skins/default/xui/en/menu_avatar_other.xml
+++ b/indra/newview/skins/default/xui/en/menu_avatar_other.xml
@@ -93,4 +93,10 @@
<menu_item_call.on_enable
function="EnablePayAvatar" />
</menu_item_call>
+ <menu_item_call
+ label="Offer Teleport"
+ name="teleport">
+ <menu_item_call.on_click
+ function="Avatar.Teleport"/>
+ </menu_item_call>
</context_menu>
diff --git a/indra/newview/skins/default/xui/en/menu_object.xml b/indra/newview/skins/default/xui/en/menu_object.xml
index 62500c5116..35518cd13b 100644
--- a/indra/newview/skins/default/xui/en/menu_object.xml
+++ b/indra/newview/skins/default/xui/en/menu_object.xml
@@ -57,6 +57,12 @@
<menu_item_call.on_enable
function="Object.EnableInspect" />
</menu_item_call>
+ <menu_item_call
+ label="Zoom In"
+ name="Zoom In">
+ <menu_item_call.on_click
+ function="Object.ZoomIn" />
+ </menu_item_call>
<menu_item_separator layout="topleft" />
<context_menu
label="Put On &gt;"