summaryrefslogtreecommitdiff
path: root/indra/newview/skins/default
diff options
context:
space:
mode:
authorLeslie Linden <leslie@lindenlab.com>2011-10-17 15:18:19 -0700
committerLeslie Linden <leslie@lindenlab.com>2011-10-17 15:18:19 -0700
commit0ff49e798c6bed6fe888ac463c746bc06036d876 (patch)
treea8ebd3f8a8a1604f6c1ec6787e2c527c00a28520 /indra/newview/skins/default
parentae3b5a4907b4611644d3b21c75ed420bc58593a2 (diff)
EXP-1359 FIX -- Selecting New Inventory window from gear menu in Inventory panel opens old My Inventory panel
* Removed old inventory panel. * Renamed new inventory panel from "my_inventory" to "inventory" Reviewed by Richard.
Diffstat (limited to 'indra/newview/skins/default')
-rw-r--r--indra/newview/skins/default/xui/en/floater_inventory.xml27
-rw-r--r--indra/newview/skins/default/xui/en/menu_viewer.xml4
2 files changed, 2 insertions, 29 deletions
diff --git a/indra/newview/skins/default/xui/en/floater_inventory.xml b/indra/newview/skins/default/xui/en/floater_inventory.xml
deleted file mode 100644
index 6d860c73fc..0000000000
--- a/indra/newview/skins/default/xui/en/floater_inventory.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater
- legacy_header_height="18"
- can_resize="true"
- height="563"
- layout="topleft"
- min_height="150"
- min_width="240"
- name="Inventory"
- help_topic="inventory"
- save_rect="true"
- save_visibility="true"
- single_instance="false"
- title="MY INVENTORY"
- width="467">
- <panel
- bottom="560"
- class="panel_main_inventory"
- filename="panel_main_inventory.xml"
- follows="all"
- layout="topleft"
- left="0"
- label="Inventory Panel"
- name="Inventory Panel"
- top="15"
- width="467" />
-</floater>
diff --git a/indra/newview/skins/default/xui/en/menu_viewer.xml b/indra/newview/skins/default/xui/en/menu_viewer.xml
index d65deb87ec..63e50b0b9f 100644
--- a/indra/newview/skins/default/xui/en/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/en/menu_viewer.xml
@@ -38,10 +38,10 @@
visible="true">
<menu_item_check.on_check
function="Floater.Visible"
- parameter="my_inventory" />
+ parameter="inventory" />
<menu_item_check.on_click
function="Floater.Toggle"
- parameter="my_inventory" />
+ parameter="inventory" />
</menu_item_check>
<menu_item_check
label="Gestures..."