summaryrefslogtreecommitdiff
path: root/indra/newview/skins/default
diff options
context:
space:
mode:
authorLeyla Farazha <leyla@lindenlab.com>2009-10-08 00:31:01 +0000
committerLeyla Farazha <leyla@lindenlab.com>2009-10-08 00:31:01 +0000
commit6f66cdf7a1307ab37d7f07928fabbe7aa4ac2673 (patch)
tree9dfcf4091996a846b6a622b9826bc283e754f62b /indra/newview/skins/default
parent3a6a18ee30425bf1000f82b0a4b245c23f0deafc (diff)
EXT-1325 Texture Picker does not open
EXT-1264 'Zoom in' world context menu opens IM session reviewed by Richard
Diffstat (limited to 'indra/newview/skins/default')
-rw-r--r--indra/newview/skins/default/xui/en/inspect_object.xml2
-rw-r--r--indra/newview/skins/default/xui/en/menu_inspect_avatar_gear.xml3
-rw-r--r--indra/newview/skins/default/xui/en/menu_inspect_object_gear.xml3
3 files changed, 5 insertions, 3 deletions
diff --git a/indra/newview/skins/default/xui/en/inspect_object.xml b/indra/newview/skins/default/xui/en/inspect_object.xml
index 97df28aa30..73a7bef77d 100644
--- a/indra/newview/skins/default/xui/en/inspect_object.xml
+++ b/indra/newview/skins/default/xui/en/inspect_object.xml
@@ -144,7 +144,7 @@ This is a really long description for an object being as how it is at least 80 c
image_disabled="OptionsMenu_Disabled"
image_selected="OptionsMenu_Press"
image_unselected="OptionsMenu_Off"
- menu_filename="menu_inspect_avatar_gear.xml"
+ menu_filename="menu_inspect_object_gear.xml"
name="gear_btn"
picture_style="true"
right="-10"
diff --git a/indra/newview/skins/default/xui/en/menu_inspect_avatar_gear.xml b/indra/newview/skins/default/xui/en/menu_inspect_avatar_gear.xml
index 9f5b7f3813..5279f9d141 100644
--- a/indra/newview/skins/default/xui/en/menu_inspect_avatar_gear.xml
+++ b/indra/newview/skins/default/xui/en/menu_inspect_avatar_gear.xml
@@ -99,10 +99,11 @@
function="InspectAvatar.VisibleFindOnMap"/>
</menu_item_call>
<menu_item_call
- enabled="false"
label="Zoom In"
layout="topleft"
name="zoom_in">
+ <menu_item_call.on_click
+ function="InspectAvatar.ZoomIn"/>
</menu_item_call>
<menu_item_call
label="Pay"
diff --git a/indra/newview/skins/default/xui/en/menu_inspect_object_gear.xml b/indra/newview/skins/default/xui/en/menu_inspect_object_gear.xml
index 1bba8eb264..93c53981f3 100644
--- a/indra/newview/skins/default/xui/en/menu_inspect_object_gear.xml
+++ b/indra/newview/skins/default/xui/en/menu_inspect_object_gear.xml
@@ -105,10 +105,11 @@
function="Object.VisibleMute" />
</menu_item_call>
<menu_item_call
- enabled="false"
label="Zoom In"
layout="topleft"
name="zoom_in">
+ <menu_item_call.on_click
+ function="InspectObject.ZoomIn" />
</menu_item_call>
<menu_item_call
label="Remove"