diff options
author | Oz Linden <oz@lindenlab.com> | 2012-03-09 12:58:50 -0500 |
---|---|---|
committer | Oz Linden <oz@lindenlab.com> | 2012-03-09 12:58:50 -0500 |
commit | 633bd44b4a9dbf7f4f262929b28848e04b446b26 (patch) | |
tree | dc3261611d5b07282c9a4210d49893be779c7d2a /indra/newview/skins/default/xui/en/sidepanel_inventory.xml | |
parent | 35dd27d5e57b2957aaa904cce841fccd4cfff850 (diff) | |
parent | 1b624f5ea686292652978c72d39e5546efe23d0f (diff) |
merge changes for vmrg-225
Diffstat (limited to 'indra/newview/skins/default/xui/en/sidepanel_inventory.xml')
-rw-r--r-- | indra/newview/skins/default/xui/en/sidepanel_inventory.xml | 3 |
1 files changed, 2 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 29aa6d1039..ee790e8dd4 100644 --- a/indra/newview/skins/default/xui/en/sidepanel_inventory.xml +++ b/indra/newview/skins/default/xui/en/sidepanel_inventory.xml @@ -48,7 +48,7 @@ height="300" width="330" /> </layout_panel> - <layout_panel + <layout_panel width="330" layout="topleft" auto_resize="true" @@ -73,6 +73,7 @@ <string name="InboxLabelWithArg">Received items ([NUM])</string> <string name="InboxLabelNoArg">Received items</string> <button + control_name="InventoryInboxToggleState" label="Received items" font="SansSerifMedium" name="inbox_btn" |