diff options
author | Merov Linden <merov@lindenlab.com> | 2012-06-08 17:29:56 -0700 |
---|---|---|
committer | Merov Linden <merov@lindenlab.com> | 2012-06-08 17:29:56 -0700 |
commit | ac6f0304c51b6b8c8e4414ff1bc254be78f0845d (patch) | |
tree | 0b211c8c84ff92e6cdbeeb8d0197314e4821a60c /indra/newview/skins/default/xui/en/sidepanel_inventory.xml | |
parent | 1aba6c119ef05a4cfd91325c8455dc8c60098746 (diff) | |
parent | cdb57cb299097b203581a6ef99840350831c321c (diff) |
Merge pull from richard/viewer-chui
Diffstat (limited to 'indra/newview/skins/default/xui/en/sidepanel_inventory.xml')
-rw-r--r-- | indra/newview/skins/default/xui/en/sidepanel_inventory.xml | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/indra/newview/skins/default/xui/en/sidepanel_inventory.xml b/indra/newview/skins/default/xui/en/sidepanel_inventory.xml index ee790e8dd4..6ecb57b41d 100644 --- a/indra/newview/skins/default/xui/en/sidepanel_inventory.xml +++ b/indra/newview/skins/default/xui/en/sidepanel_inventory.xml @@ -48,10 +48,10 @@ height="300" width="330" /> </layout_panel> - <layout_panel + <layout_panel width="330" layout="topleft" - auto_resize="true" + auto_resize="false" user_resize="true" follows="left|right|top" name="inbox_layout_panel" @@ -105,6 +105,7 @@ [NUM] new </text> <panel + name="inbox_inventory_placeholder_panel" follows="all" left="10" bottom="235" |