2 files changed, 180 insertions, 103 deletions

diff --git a/linden/indra/newview/skins/default/xui/en-us/floater_inventory.xml b/linden/indra/newview/skins/default/xui/en-us/floater_inventory.xml
index 1cb1da0..590555f 100644
--- a/linden/indra/newview/skins/default/xui/en-us/floater_inventory.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/floater_inventory.xml
@@ -5,18 +5,64 @@
      title="Inventory" width="467">
         <search_editor bottom="-50" follows="left|top|right" height="16" label="Type here to search"
              left="6" mouse_opaque="true" name="inventory search editor" width="455" />
-        <tab_container bottom_delta="-512" follows="left|top|right|bottom" height="508" left="2"
-             mouse_opaque="false" name="inventory filter tabs" tab_position="top"
-             width="463">
+
+        <text name="group_titles_textbox" font="SansSerifSmall" follows="left|top"
+                                height="16" left="10" bottom_delta="-24" width="120">
+                Quick Filter:
+        </text>
+
+        <!-- Inventory Type Filter Labels -->
+        <string name="filter_type_all">All Types</string>
+        <string name="filter_type_animation">Animations</string>
+        <string name="filter_type_bodypart">Body Parts</string>
+        <string name="filter_type_callingcard">Calling Cards</string>
+        <string name="filter_type_clothing">Clothing</string>
+        <string name="filter_type_gesture">Gestures</string>
+        <string name="filter_type_landmark">Landmarks</string>
+        <string name="filter_type_notecard">Notecards</string>
+        <string name="filter_type_object">Objects</string>
+        <string name="filter_type_script">Scripts</string>
+        <string name="filter_type_sound">Sounds</string>
+        <string name="filter_type_texture">Textures</string>
+        <string name="filter_type_snapshot">Snapshots</string>
+        <string name="filter_type_custom">Custom...</string>
+
+        <combo_box name="Quick Filter" label="Quick Filter" follows="left|top"
+                   height="20" left="80" width="150" bottom_delta="0">
+
+                <combo_item name="filter_type_all">All Types</combo_item>
+                <separator />
+                <combo_item name="filter_type_animation">Animations</combo_item>
+                <combo_item name="filter_type_bodypart">Body Parts</combo_item>
+                <combo_item name="filter_type_callingcard">Calling Cards</combo_item>
+                <combo_item name="filter_type_clothing">Clothing</combo_item>
+                <combo_item name="filter_type_gesture">Gestures</combo_item>
+                <combo_item name="filter_type_landmark">Landmarks</combo_item>
+                <combo_item name="filter_type_notecard">Notecards</combo_item>
+                <combo_item name="filter_type_object">Objects</combo_item>
+                <combo_item name="filter_type_script">Scripts</combo_item>
+                <combo_item name="filter_type_sound">Sounds</combo_item>
+                <combo_item name="filter_type_texture">Textures</combo_item>
+                <combo_item name="filter_type_snapshot">Snapshots</combo_item>
+                <separator />
+                <combo_item name="filter_type_custom">Custom...</combo_item>
+
+        </combo_box>
+
+        <tab_container name="inventory filter tabs" follows="left|top|right|bottom"
+             bottom_delta="-487" height="480" left="2" width="463"
+             mouse_opaque="false" tab_position="top">
+
                 <inventory_panel allow_multi_select="true" border="true" bottom="-507"
-                     follows="left|top|right|bottom" height="491" label="All Items" left="1"
+                     follows="left|top|right|bottom" height="431" label="All Items" left="1"
                      mouse_opaque="true" name="All Items" sort_order="InventorySortOrder"
                      width="461" />
                 <inventory_panel allow_multi_select="true" border="true" bottom_delta="0"
-                     follows="left|top|right|bottom" height="491" label="Recent Items"
+                     follows="left|top|right|bottom" height="431" label="Recent Items"
                      left_delta="0" mouse_opaque="true" name="Recent Items"
                      sort_order="RecentItemsSortOrder" width="461" />
         </tab_container>
+
         <menu_bar bottom="-34" drop_shadow="false" follows="left|top|right" height="18" left="2"
              mouse_opaque="false" name="Inventory Menu" opaque="false" width="461">
                 <menu bottom_delta="16" drop_shadow="true" height="101"
diff --git a/linden/indra/newview/skins/default/xui/en-us/floater_inventory_view_finder.xml b/linden/indra/newview/skins/default/xui/en-us/floater_inventory_view_finder.xml
index 9a9b8db..9a5756b 100644
--- a/linden/indra/newview/skins/default/xui/en-us/floater_inventory_view_finder.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/floater_inventory_view_finder.xml
@@ -1,102 +1,133 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater bottom="-495" can_close="true" can_drag_on_left="false" can_minimize="false"
-     can_resize="false" can_tear_off="true" enabled="true" height="408"
-     left="457" min_height="408" min_width="160" mouse_opaque="true"
-     name="Inventory Finder" title="inventory_recent_items" width="160">
-        <icon bottom="-36" color="1 1 1 1" enabled="true" follows="left|top" height="16"
-             image_name="inv_item_animation.tga" left="8" mouse_opaque="true"
-             name="icon_animation" width="16" />
-        <check_box bottom="-36" enabled="true" follows="left|top" font="SansSerifSmall"
-             height="16" initial_value="false" label="Animation" left="26"
-             mouse_opaque="true" name="check_animation" radio_style="false" width="126" />
-        <icon bottom="-56" color="1 1 1 1" enabled="true" follows="left|top" height="16"
-             image_name="inv_item_callingcard_online.tga" left="8" mouse_opaque="true"
-             name="icon_calling_card" width="16" />
-        <check_box bottom="-56" enabled="true" follows="left|top" font="SansSerifSmall"
-             height="16" initial_value="false" label="Calling Cards" left="26"
-             mouse_opaque="true" name="check_calling_card" radio_style="false"
-             width="126" />
-        <icon bottom="-76" color="1 1 1 1" enabled="true" follows="left|top" height="16"
-             image_name="inv_item_shirt.tga" left="8" mouse_opaque="true"
-             name="icon_clothing" width="16" />
-        <check_box bottom="-76" enabled="true" follows="left|top" font="SansSerifSmall"
-             height="16" initial_value="false" label="Clothing" left="26"
-             mouse_opaque="true" name="check_clothing" radio_style="false" width="126" />
-        <icon bottom="-96" color="1 1 1 1" enabled="true" follows="left|top" height="16"
-             image_name="inv_item_gesture.tga" left="8" mouse_opaque="true"
-             name="icon_gesture" width="16" />
-        <check_box bottom="-96" enabled="true" follows="left|top" font="SansSerifSmall"
-             height="16" initial_value="false" label="Gestures" left="26"
-             mouse_opaque="true" name="check_gesture" radio_style="false" width="126" />
-        <icon bottom="-116" color="1 1 1 1" enabled="true" follows="left|top" height="16"
-             image_name="inv_item_landmark_visited.tga" left="8" mouse_opaque="true"
-             name="icon_landmark" width="16" />
-        <check_box bottom="-116" enabled="true" follows="left|top" font="SansSerifSmall"
-             height="16" initial_value="false" label="Landmarks" left="26"
-             mouse_opaque="true" name="check_landmark" radio_style="false" width="126" />
-        <icon bottom="-136" color="1 1 1 1" enabled="true" follows="left|top" height="16"
-             image_name="inv_item_notecard.tga" left="8" mouse_opaque="true"
-             name="icon_notecard" width="16" />
-        <check_box bottom="-136" enabled="true" follows="left|top" font="SansSerifSmall"
-             height="16" initial_value="false" label="Notecards" left="26"
-             mouse_opaque="true" name="check_notecard" radio_style="false" width="126" />
-        <icon bottom="-156" color="1 1 1 1" enabled="true" follows="left|top" height="16"
-             image_name="inv_item_object.tga" left="8" mouse_opaque="true"
-             name="icon_object" width="16" />
-        <check_box bottom="-156" enabled="true" follows="left|top" font="SansSerifSmall"
-             height="16" initial_value="false" label="Objects" left="26"
-             mouse_opaque="true" name="check_object" radio_style="false" width="126" />
-        <icon bottom="-176" color="1 1 1 1" enabled="true" follows="left|top" height="16"
-             image_name="inv_item_script.tga" left="8" mouse_opaque="true"
-             name="icon_script" width="16" />
-        <check_box bottom="-176" enabled="true" follows="left|top" font="SansSerifSmall"
-             height="16" initial_value="false" label="Scripts" left="26"
-             mouse_opaque="true" name="check_script" radio_style="false" width="126" />
-        <icon bottom="-196" color="1 1 1 1" enabled="true" follows="left|top" height="16"
-             image_name="inv_item_sound.tga" left="8" mouse_opaque="true"
-             name="icon_sound" width="16" />
-        <check_box bottom="-196" enabled="true" follows="left|top" font="SansSerifSmall"
-             height="16" initial_value="false" label="Sounds" left="26"
-             mouse_opaque="true" name="check_sound" radio_style="false" width="126" />
-        <icon bottom="-216" color="1 1 1 1" enabled="true" follows="left|top" height="16"
-             image_name="inv_item_texture.tga" left="8" mouse_opaque="true"
-             name="icon_texture" width="16" />
-        <check_box bottom="-216" enabled="true" follows="left|top" font="SansSerifSmall"
-             height="16" initial_value="false" label="Textures" left="26"
-             mouse_opaque="true" name="check_texture" radio_style="false" width="126" />
-        <icon bottom="-236" color="1 1 1 1" enabled="true" follows="left|top" height="16"
-             image_name="inv_item_snapshot.tga" left="8" mouse_opaque="true"
-             name="icon_snapshot" width="16" />
-        <check_box bottom="-236" enabled="true" follows="left|top" font="SansSerifSmall"
-             height="16" initial_value="false" label="Snapshots" left="26"
-             mouse_opaque="true" name="check_snapshot" radio_style="false" width="126" />
-        <button bottom="-260" enabled="true" follows="left|top" font="SansSerif"
-             halign="center" height="20" label="All" label_selected="All" left="8"
-             mouse_opaque="true" name="All" scale_image="true" width="100" />
-        <button bottom="-284" enabled="true" follows="left|top" font="SansSerif"
-             halign="center" height="20" label="None" label_selected="None" left="8"
-             mouse_opaque="true" name="None" scale_image="true" width="100" />
-        <check_box bottom="-304" enabled="true" follows="left|top" font="SansSerifSmall"
-             height="16" initial_value="false" label="Always show folders" left="8"
-             mouse_opaque="true" name="check_show_empty" radio_style="false" width="144" />
-        <check_box bottom="-324" enabled="true" follows="left|top" font="SansSerifSmall"
-             height="16" initial_value="false" label="Since Logoff" left="8"
-             mouse_opaque="true" name="check_since_logoff" radio_style="false"
-             width="144" />
-        <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-             bottom="-336" drop_shadow_visible="true" enabled="true" follows="left|top"
-             font="SansSerifSmall" h_pad="0" halign="center" height="12" left="8"
-             mouse_opaque="true" name="- OR -" v_pad="0" width="144">
+
+<floater name="Inventory Finder" title="inventory_recent_items" 
+     bottom="-495" left="457" height="428" width="170"
+     can_close="true" can_drag_on_left="false" can_minimize="false"
+     can_resize="false" can_tear_off="true">
+
+
+        <icon name="icon_animation" image_name="inv_item_animation.tga" 
+             bottom="-36" left="8" height="16" width="16" follows="left|top" />
+        <check_box label="Animation" name="check_animation"
+             bottom_delta="0" left="26" height="16" width="126" follows="left|top"
+             font="SansSerifSmall" initial_value="false" />
+
+
+        <icon name="icon_bodypart" image_name="inv_item_skin.tga"
+             bottom_delta="-20" left="8" height="16" width="16" follows="left|top" />
+        <check_box label="Body Parts" name="check_bodypart"
+             bottom_delta="0" left="26" height="16" width="126" follows="left|top"
+             font="SansSerifSmall" initial_value="false" />
+
+
+        <icon name="icon_calling_card" image_name="inv_item_callingcard_online.tga"
+             bottom_delta="-20" left="8" height="16" width="16" follows="left|top" />
+        <check_box label="Calling Cards" name="check_calling_card"
+             bottom_delta="0" left="26" height="16" width="126" follows="left|top"
+             font="SansSerifSmall" initial_value="false" />
+
+
+        <icon name="icon_clothing" image_name="inv_item_shirt.tga"
+             bottom_delta="-20" left="8" height="16" width="16" follows="left|top" />
+        <check_box label="Clothing" name="check_clothing"
+             bottom_delta="0" left="26" height="16" width="126" follows="left|top"
+             font="SansSerifSmall" initial_value="false" />
+
+
+        <icon name="icon_gesture" image_name="inv_item_gesture.tga"
+             bottom_delta="-20" left="8" height="16" width="16" follows="left|top" />
+        <check_box label="Gestures" name="check_gesture"
+             bottom_delta="0" left="26" height="16" width="126" follows="left|top"
+             font="SansSerifSmall" initial_value="false" />
+
+
+        <icon name="icon_landmark" image_name="inv_item_landmark_visited.tga"
+             bottom_delta="-20" left="8" height="16" width="16" follows="left|top" />
+        <check_box label="Landmarks" name="check_landmark"
+             bottom_delta="0" left="26" height="16" width="126" follows="left|top"
+             font="SansSerifSmall" initial_value="false" />
+
+
+        <icon name="icon_notecard" image_name="inv_item_notecard.tga"
+             bottom_delta="-20" left="8" height="16" width="16" follows="left|top" />
+        <check_box label="Notecards" name="check_notecard"
+             bottom_delta="0" left="26" height="16" width="126" follows="left|top"
+             font="SansSerifSmall" initial_value="false" />
+
+
+        <icon name="icon_object" image_name="inv_item_object.tga"
+             bottom_delta="-20" left="8" height="16" width="16" follows="left|top" />
+        <check_box label="Objects" name="check_object"
+             bottom_delta="0" left="26" height="16" width="126" follows="left|top"
+             font="SansSerifSmall" initial_value="false" />
+
+
+        <icon name="icon_script" image_name="inv_item_script.tga"
+             bottom_delta="-20" left="8" height="16" width="16" follows="left|top" />
+        <check_box label="Scripts" name="check_script"
+             bottom_delta="0" left="26" height="16" width="126" follows="left|top"
+             font="SansSerifSmall" initial_value="false" />
+
+
+        <icon name="icon_sound" image_name="inv_item_sound.tga"
+             bottom_delta="-20" left="8" height="16" width="16" follows="left|top" />
+        <check_box label="Sounds" name="check_sound"
+             bottom_delta="0" left="26" height="16" width="126" follows="left|top"
+             font="SansSerifSmall" initial_value="false" />
+
+
+        <icon name="icon_texture" image_name="inv_item_texture.tga"
+             bottom_delta="-20" left="8" height="16" width="16" follows="left|top" />
+        <check_box label="Textures" name="check_texture"
+             bottom_delta="0" left="26" height="16" width="126" follows="left|top"
+             font="SansSerifSmall" initial_value="false" />
+
+
+        <icon name="icon_snapshot" image_name="inv_item_snapshot.tga"
+             bottom_delta="-20" left="8" height="16" width="16" follows="left|top" />
+        <check_box label="Snapshots" name="check_snapshot"
+             bottom_delta="0" left="26" height="16" width="126" follows="left|top"
+             font="SansSerifSmall" initial_value="false" />
+
+
+        <button label="All" label_selected="All" name="All"
+             bottom_delta="-24" left="8" height="20" width="100" follows="left|top"
+             font="SansSerif" halign="center" scale_image="true" />
+
+        <button label="None" label_selected="None" name="None"
+             bottom_delta="-24" left="8" height="20" width="100" follows="left|top"
+             font="SansSerif" halign="center" scale_image="true" />
+
+
+        <check_box label="Always show folders" name="check_show_empty"
+             bottom_delta="-20" left="8" height="16" width="144" follows="left|top"
+             font="SansSerifSmall" initial_value="false" />
+
+
+        <check_box label="Since Logoff" name="check_since_logoff" 
+             bottom_delta="-20" left="8" height="16" width="144" follows="left|top"
+             font="SansSerifSmall" initial_value="false" />
+
+
+        <text name="- OR -" type="string" length="1"
+             bottom_delta="-12" left="8" height="12" width="144" follows="left|top"
+             halign="center" h_pad="0" v_pad="0"
+             bg_visible="false" border_drop_shadow_visible="false"
+             border_visible="false" drop_shadow_visible="true"
+             font="SansSerifSmall">
                 - OR -
         </text>
-        <spinner bottom="-356" enabled="true" follows="left|top" height="16" increment="1"
-             initial_val="0" label="Hours Ago" label_width="64" left="8"
-             max_val="240000" min_val="0" mouse_opaque="true" name="spin_hours_ago"
-             width="144" />
-        <spinner bottom="-376" enabled="true" follows="left|top" height="16" increment="1"
-             initial_val="0" label="Days Ago" label_width="64" left="8" max_val="10000"
-             min_val="0" mouse_opaque="true" name="spin_days_ago" width="144" />
-        <button bottom="-400" enabled="true" follows="top|right" font="SansSerif"
-             halign="center" height="20" label="Close" label_selected="Close"
-             mouse_opaque="true" name="Close" right="-6" scale_image="true" width="76" />
+
+
+        <spinner label="Hours Ago" label_width="64" name="spin_hours_ago"
+             bottom_delta="-20" left="8" height="16" width="144" follows="left|top"
+             increment="1" initial_val="0" max_val="240000" min_val="0" />
+        <spinner label="Days Ago" label_width="64" name="spin_days_ago"
+             bottom_delta="-20" left="8" width="144" height="16" follows="left|top"
+             increment="1" initial_val="0" max_val="10000" min_val="0" />
+
+
+        <button label="Close" label_selected="Close" name="Close"
+             bottom="-420" right="-6" height="20" width="76" follows="top|right"
+             font="SansSerif" halign="center" scale_image="true" />
 </floater>