diff options
author | Richard Linden <none@none> | 2012-03-22 10:58:04 -0700 |
---|---|---|
committer | Richard Linden <none@none> | 2012-03-22 10:58:04 -0700 |
commit | d6d1cb852d014dd002656ed35537975ebb6300b0 (patch) | |
tree | 0e432c855eb3105e2c1e2bd67a3010b6c73f7b50 /indra/newview/skins/default/xui/en/sidepanel_inventory.xml | |
parent | b187aeb8f177bd76e792652e773617beff18b47b (diff) | |
parent | 71db6d1b91cb8a62959a63ae36d3727e48439245 (diff) |
Automated merge with http://hg.secondlife.com/viewer-release
Diffstat (limited to 'indra/newview/skins/default/xui/en/sidepanel_inventory.xml')
-rw-r--r-- | indra/newview/skins/default/xui/en/sidepanel_inventory.xml | 4 |
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 29aa6d1039..6ecb57b41d 100644 --- a/indra/newview/skins/default/xui/en/sidepanel_inventory.xml +++ b/indra/newview/skins/default/xui/en/sidepanel_inventory.xml @@ -51,7 +51,7 @@ <layout_panel width="330" layout="topleft" - auto_resize="true" + auto_resize="false" user_resize="true" follows="left|right|top" name="inbox_layout_panel" @@ -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" @@ -104,6 +105,7 @@ [NUM] new </text> <panel + name="inbox_inventory_placeholder_panel" follows="all" left="10" bottom="235" |