diff options
| author | Leyla Farazha <leyla@lindenlab.com> | 2011-06-06 16:30:22 -0700 |
|---|---|---|
| committer | Leyla Farazha <leyla@lindenlab.com> | 2011-06-06 16:30:22 -0700 |
| commit | 0c0f7558782edccda375609777967184b8440441 (patch) | |
| tree | cb6d5343df2b7245807f2e42f9b543552aff48ca /indra/newview/skins/default | |
| parent | 4b43c8b18a82d9aa8af6798706867c4a5ebc4334 (diff) | |
fixing drag and drop for inbox, adding inbox text and cleaning up context menus
Diffstat (limited to 'indra/newview/skins/default')
| -rw-r--r-- | indra/newview/skins/default/xui/en/sidepanel_inventory.xml | 25 |
1 files changed, 21 insertions, 4 deletions
diff --git a/indra/newview/skins/default/xui/en/sidepanel_inventory.xml b/indra/newview/skins/default/xui/en/sidepanel_inventory.xml index 49c45233d8..91de3047e6 100644 --- a/indra/newview/skins/default/xui/en/sidepanel_inventory.xml +++ b/indra/newview/skins/default/xui/en/sidepanel_inventory.xml @@ -9,7 +9,7 @@ min_width="240" name="objects panel" width="333"> - <panel + <panel follows="all" layout="topleft" left="0" @@ -66,6 +66,8 @@ label="" height="125" width="330"> + <string name="InboxLabelWithArg">MARKETPLACE INBOX ([NUM])</string> + <string name="InboxLabelNoArg">MARKETPLACE INBOX</string> <button label="MARKETPLACE INBOX" name="inbox_btn" @@ -84,9 +86,24 @@ follows="all" left="10" height="90" - width="330" + width="308" top="35" + bg_opaque_color="InventoryBackgroundColor" + background_visible="true" + background_opaque="true" > + <text + type="string" + length="1" + follows="top|left|right" + font="SansSerifSmall" + use_ellipses="true" + name="move_items_text" + top="10" + left="4" + height="20" + width="304" + >Move items to your inventory to manage and use them.</text> <inventory_panel bg_opaque_color="DkGray2" bg_alpha_color="DkGray2" @@ -95,14 +112,14 @@ border="false" bevel_style="none" follows="all" - height="90" + height="70" start_folder="Inbox" layout="topleft" left="0" name="inventory_inbox" sort_order_setting="InventorySortOrder" show_item_link_overlays="true" - top="0" + top_pad="0" width="308" /> </panel> </panel> |