summaryrefslogtreecommitdiff
path: root/indra/newview/skins/default/xui/en/menu_viewer.xml
diff options
context:
space:
mode:
authorLeslie Linden <leslie@lindenlab.com>2011-10-13 16:48:59 -0700
committerLeslie Linden <leslie@lindenlab.com>2011-10-13 16:48:59 -0700
commitc054f1faed8f87f7c6dfb83c2a13ae3cae97ec89 (patch)
tree07602b720fed24f5412c9f2f1f82e98f08d73a08 /indra/newview/skins/default/xui/en/menu_viewer.xml
parent4c663ca8b997bd74fb3b646c3cb3870555dfeb91 (diff)
* Hooked up build FUI toolbar button
* Added Shop button to status bar * Changed "Inventory..." menu item to go to same window as toolbar inventory button
Diffstat (limited to 'indra/newview/skins/default/xui/en/menu_viewer.xml')
-rw-r--r--indra/newview/skins/default/xui/en/menu_viewer.xml18
1 files changed, 3 insertions, 15 deletions
diff --git a/indra/newview/skins/default/xui/en/menu_viewer.xml b/indra/newview/skins/default/xui/en/menu_viewer.xml
index 69029d2ab9..833e8b9f32 100644
--- a/indra/newview/skins/default/xui/en/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/en/menu_viewer.xml
@@ -34,25 +34,13 @@
<menu_item_check
label="Inventory..."
name="Inventory"
- shortcut="control|shift|I"
- visible="false">
+ shortcut="control|I"
+ visible="true">
<menu_item_check.on_check
function="Floater.Visible"
- parameter="inventory" />
- <menu_item_check.on_click
- function="Floater.Toggle"
- parameter="inventory" />
- </menu_item_check>
- <menu_item_check
- label="Inventory..."
- name="ShowSidetrayInventory"
- shortcut="control|I"
- visible="true">
- <menu_item_check.on_check
- function="SidetrayPanelVisible"
parameter="my_inventory" />
<menu_item_check.on_click
- function="ShowSidetrayPanel"
+ function="Floater.Toggle"
parameter="my_inventory" />
</menu_item_check>
<menu_item_check