summaryrefslogtreecommitdiff
path: root/indra/newview/skins
diff options
context:
space:
mode:
authorLeslie Linden <none@none>2011-06-01 13:50:14 -0700
committerLeslie Linden <none@none>2011-06-01 13:50:14 -0700
commit651a9587f82a143764856a4c2603d89c5d392cb6 (patch)
tree6a1edacb76f174f0f23609d2da79ac95e5b0794a /indra/newview/skins
parentcbf38d7c95e5968f47850d082eee223e1cef1aff (diff)
EXP-862 FIX -- Disable marketplace inbox/outbox panel separator when inbox and outbox are collapsed
Marketplace panel is only resizable now when inbox or outbox is expanded. Reviewed by Leyla
Diffstat (limited to 'indra/newview/skins')
-rw-r--r--indra/newview/skins/default/xui/en/sidepanel_inventory.xml41
1 files changed, 22 insertions, 19 deletions
diff --git a/indra/newview/skins/default/xui/en/sidepanel_inventory.xml b/indra/newview/skins/default/xui/en/sidepanel_inventory.xml
index ffc018b856..484e90f083 100644
--- a/indra/newview/skins/default/xui/en/sidepanel_inventory.xml
+++ b/indra/newview/skins/default/xui/en/sidepanel_inventory.xml
@@ -26,11 +26,14 @@
top="0"
orientation="vertical"
name="inventory_layout_stack"
- height="535"
+ height="535"
width="330">
<layout_panel
+ name="main_inventory_layout_panel"
+ min_dim="150"
width="330"
- follows="bottom|left|right"
+ follows="bottom|left|right"
+ user_resize="false"
height="480">
<panel
class="panel_main_inventory"
@@ -45,14 +48,14 @@
width="330" />
</layout_panel>
<layout_panel
- width="330"
- auto_resize="true"
- user_resize="false"
- follows="bottom|left|right"
- min_dim="35"
- name="inbox_layout_panel"
- max_dim="125"
- height="35">
+ width="330"
+ auto_resize="true"
+ user_resize="false"
+ follows="bottom|left|right"
+ min_dim="35"
+ name="inbox_layout_panel"
+ max_dim="125"
+ height="35">
<panel
follows="all"
layout="topleft"
@@ -69,14 +72,14 @@
height="35"
width="308"
image_unselected="MarketplaceBtn_Off"
- image_selected="MarketplaceBtn_Selected"
+ image_selected="MarketplaceBtn_Selected"
halign="left"
follows="top|left|right"
is_toggle="true"
tab_stop="false"
pad_left="35"
top="0"
- left="10" />
+ left="10" />
<panel
follows="all"
left="10"
@@ -105,14 +108,14 @@
</panel>
</layout_panel>
<layout_panel
- width="330"
- auto_resize="true"
+ width="330"
+ auto_resize="true"
user_resize="false"
- follows="bottom|left|right"
- name="outbox_layout_panel"
- min_dim="35"
- max_dim="125"
- height="35">
+ follows="bottom|left|right"
+ name="outbox_layout_panel"
+ min_dim="35"
+ max_dim="125"
+ height="35">
<panel
follows="top|left|right"
layout="topleft"