summaryrefslogtreecommitdiff
path: root/indra/newview/skins
diff options
context:
space:
mode:
Diffstat (limited to 'indra/newview/skins')
-rw-r--r--indra/newview/skins/default/xui/en/menu_inventory_view_default.xml1
-rw-r--r--indra/newview/skins/default/xui/en/panel_main_inventory.xml11
2 files changed, 11 insertions, 1 deletions
diff --git a/indra/newview/skins/default/xui/en/menu_inventory_view_default.xml b/indra/newview/skins/default/xui/en/menu_inventory_view_default.xml
index 28ec8f2bf1..c7f9822e41 100644
--- a/indra/newview/skins/default/xui/en/menu_inventory_view_default.xml
+++ b/indra/newview/skins/default/xui/en/menu_inventory_view_default.xml
@@ -89,7 +89,6 @@
<menu_item_check
label="Combination view"
layout="topleft"
- enabled="false"
name="combination_view">
<on_click
function="Inventory.GearDefault.Custom.Action"
diff --git a/indra/newview/skins/default/xui/en/panel_main_inventory.xml b/indra/newview/skins/default/xui/en/panel_main_inventory.xml
index d670161e00..dc8720b9d1 100644
--- a/indra/newview/skins/default/xui/en/panel_main_inventory.xml
+++ b/indra/newview/skins/default/xui/en/panel_main_inventory.xml
@@ -328,4 +328,15 @@
follows="all"
layout="topleft" />
</panel>
+ <panel
+ follows="all"
+ halign="center"
+ height="372"
+ layout="topleft"
+ left="7"
+ name="combination_view_inventory"
+ top_delta="0"
+ visible="false"
+ width="312">
+ </panel>
</panel>