summaryrefslogtreecommitdiff
path: root/indra/newview/skins/default/xui/en
diff options
context:
space:
mode:
authorLeyla Farazha <leyla@lindenlab.com>2011-06-22 16:18:23 -0700
committerLeyla Farazha <leyla@lindenlab.com>2011-06-22 16:18:23 -0700
commitb84881382b265a7e4fad1b03dfb935992880ce70 (patch)
tree2be1dc98b3c29e4745c79f6c0c6134a9598498a1 /indra/newview/skins/default/xui/en
parent5999574c106d0d2566d191c754f6a630d8407787 (diff)
parent4267014b146798cabe96568b2091c6bb2dd2b294 (diff)
merge and fixing linux build issues
Diffstat (limited to 'indra/newview/skins/default/xui/en')
-rw-r--r--indra/newview/skins/default/xui/en/sidepanel_inventory.xml4
1 files changed, 3 insertions, 1 deletions
diff --git a/indra/newview/skins/default/xui/en/sidepanel_inventory.xml b/indra/newview/skins/default/xui/en/sidepanel_inventory.xml
index 1fedd6aab8..00f3135035 100644
--- a/indra/newview/skins/default/xui/en/sidepanel_inventory.xml
+++ b/indra/newview/skins/default/xui/en/sidepanel_inventory.xml
@@ -52,9 +52,10 @@
auto_resize="true"
user_resize="false"
follows="bottom|left|right"
- min_dim="35"
name="inbox_layout_panel"
+ min_dim="35"
max_dim="200"
+ expanded_min_dim="90"
height="200">
<panel
follows="all"
@@ -141,6 +142,7 @@
name="outbox_layout_panel"
min_dim="35"
max_dim="200"
+ expanded_min_dim="90"
height="200">
<panel
follows="all"