diff options
| author | Leyla Farazha <leyla@lindenlab.com> | 2011-07-05 15:18:01 -0700 |
|---|---|---|
| committer | Leyla Farazha <leyla@lindenlab.com> | 2011-07-05 15:18:01 -0700 |
| commit | 752cf885f1a115c5f82dbba111e3a7e4d8cf1f40 (patch) | |
| tree | f1d33b97d77e10b196451a21b8d78970c5f887c4 /indra/newview/skins/default/xui | |
| parent | f0e853d5d6de793137e8ee67760f7fa6ddde952e (diff) | |
| parent | 2f21ec48a222662351c9f8e7243673eb6a31b457 (diff) | |
merge
Diffstat (limited to 'indra/newview/skins/default/xui')
3 files changed, 17 insertions, 5 deletions
diff --git a/indra/newview/skins/default/xui/en/panel_inbox_inventory.xml b/indra/newview/skins/default/xui/en/panel_inbox_inventory.xml index 49abbcde71..d06190ec54 100644 --- a/indra/newview/skins/default/xui/en/panel_inbox_inventory.xml +++ b/indra/newview/skins/default/xui/en/panel_inbox_inventory.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8" standalone="yes" ?> -<inventory_panel +<inbox_inventory_panel name="inventory_inbox" - start_folder="Inbox" + start_folder="Received Items" follows="all" layout="topleft" top="0" left="0" height="165" width="308" top_pad="0" @@ -14,4 +14,4 @@ show_item_link_overlays="true" > <scroll reserve_scroll_corner="false" /> -</inventory_panel> +</inbox_inventory_panel> diff --git a/indra/newview/skins/default/xui/en/sidepanel_inventory.xml b/indra/newview/skins/default/xui/en/sidepanel_inventory.xml index baf37ae0b4..79a0ec7c72 100644 --- a/indra/newview/skins/default/xui/en/sidepanel_inventory.xml +++ b/indra/newview/skins/default/xui/en/sidepanel_inventory.xml @@ -53,9 +53,10 @@ user_resize="false" follows="bottom|left|right" name="inbox_layout_panel" + visible="false" min_dim="35" max_dim="200" - expanded_min_dim="90" + expanded_min_dim="90" height="200"> <panel follows="all" @@ -133,9 +134,10 @@ user_resize="false" follows="bottom|left|right" name="outbox_layout_panel" + visible="false" min_dim="35" max_dim="200" - expanded_min_dim="90" + expanded_min_dim="90" height="200"> <panel follows="all" diff --git a/indra/newview/skins/default/xui/en/widgets/inbox_folder_view_folder.xml b/indra/newview/skins/default/xui/en/widgets/inbox_folder_view_folder.xml new file mode 100644 index 0000000000..2c987b158d --- /dev/null +++ b/indra/newview/skins/default/xui/en/widgets/inbox_folder_view_folder.xml @@ -0,0 +1,10 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes" ?> +<inbox_folder_view_folder + folder_arrow_image="Folder_Arrow" + folder_indentation="8" + item_height="20" + item_top_pad="4" + selection_image="Rounded_Square" + > + <new_badge label="New" location="right" location_percent_hcenter="70" /> +</inbox_folder_view_folder> |