diff options
author | Rider Linden <rider@lindenlab.com> | 2017-10-17 14:40:59 -0700 |
---|---|---|
committer | Rider Linden <rider@lindenlab.com> | 2017-10-17 14:40:59 -0700 |
commit | cf74a9438aae7ab1b10c7ffa77c6509e588869a0 (patch) | |
tree | 79c2714ba2bb2e0d526b5644f5b832c911fe6900 /indra/newview/skins/default/xui/en/panel_main_inventory.xml | |
parent | 24ed3844afe2d54a03975c1704c595cf02e5643f (diff) | |
parent | 5754493cdcfeac76d0576abc19bdf5a03717780d (diff) |
Merge
Diffstat (limited to 'indra/newview/skins/default/xui/en/panel_main_inventory.xml')
-rw-r--r-- | indra/newview/skins/default/xui/en/panel_main_inventory.xml | 42 |
1 files changed, 40 insertions, 2 deletions
diff --git a/indra/newview/skins/default/xui/en/panel_main_inventory.xml b/indra/newview/skins/default/xui/en/panel_main_inventory.xml index 0a85477bf4..df70398599 100644 --- a/indra/newview/skins/default/xui/en/panel_main_inventory.xml +++ b/indra/newview/skins/default/xui/en/panel_main_inventory.xml @@ -41,13 +41,37 @@ text_pad_left="10" follows="left|top|right" height="23" - label="Filter Inventory" + label="Enter search text" layout="topleft" left="10" max_length_chars="300" name="inventory search editor" top="18" - width="303" /> + width="208" /> + <combo_box + height="23" + layout="topleft" + left_pad="4" + name="search_type" + follows="top|right" + width="90"> + <item + label="Name" + name="Name" + value="search_by_name"/> + <item + label="Creator" + name="Creator" + value="search_by_creator"/> + <item + label="Description" + name="Description" + value="search_by_description"/> + <item + label="UUID" + name="UUID" + value="search_by_UUID"/> + </combo_box> <tab_container follows="all" halign="center" @@ -92,6 +116,20 @@ name="Recent Items" show_item_link_overlays="true" width="290" /> + <inventory_panel + name="Worn Items" + label="WORN" + show_empty_message="false" + follows="all" + layout="topleft" + width="290" + bg_opaque_color="DkGray2" + bg_alpha_color="DkGray2" + background_visible="true" + border="false" + bevel_style="none" + scroll.reserve_scroll_corner="false"> + </inventory_panel> </tab_container> <layout_stack animate="false" |