5 files changed, 424 insertions, 103 deletions

diff --git a/linden/indra/llui/llcombobox.cpp b/linden/indra/llui/llcombobox.cpp
index 9a2e13b..cb9dd4e 100644
--- a/linden/indra/llui/llcombobox.cpp
+++ b/linden/indra/llui/llcombobox.cpp
@@ -194,6 +194,11 @@ LLView* LLComboBox::fromXML(LLXMLNodePtr node, LLView *parent, LLUICtrlFactory *
 
                                 combo_box->add(label, LLSD(value) );
                         }
+
+      else if (child->hasName("separator"))
+                        {
+                                combo_box->addSeparator();
+                        }
                 }
         }
 
diff --git a/linden/indra/newview/llinventoryview.cpp b/linden/indra/newview/llinventoryview.cpp
index f9dd70d..f64dd0d 100644
--- a/linden/indra/newview/llinventoryview.cpp
+++ b/linden/indra/newview/llinventoryview.cpp
@@ -44,6 +44,7 @@
 #include "llradiogroup.h"
 #include "llspinctrl.h"
 #include "lltextbox.h"
+#include "llcombobox.h"
 #include "llui.h"
 
 #include "llfirstuse.h"
@@ -549,6 +550,12 @@ void LLInventoryView::init(LLInventoryModel* inventory)
                 mSearchEditor->setSearchCallback(onSearchEdit, this);
         }
 
+        mQuickFilterCombo = getChild<LLComboBox>("Quick Filter");
+        if (mQuickFilterCombo)
+        {
+                mQuickFilterCombo->setCommitCallback(onQuickFilterCommit);
+        }
+
         sActiveViews.put(this);
 
         gInventory.addObserver(this);
@@ -617,6 +624,11 @@ void LLInventoryView::draw()
         {
                 mSearchEditor->setText(mActivePanel->getFilterSubString());
         }
+        if (mActivePanel && mQuickFilterCombo)
+        {
+                refreshQuickFilter( mQuickFilterCombo );
+        }
+
         LLFloater::draw();
 }
 
@@ -981,6 +993,238 @@ void LLInventoryView::onSearchEdit(const std::string& search_string, void* user_
 }
 
 
+//static
+void LLInventoryView::onQuickFilterCommit(LLUICtrl* ctrl, void* user_data)
+{
+
+        LLComboBox* quickfilter = (LLComboBox*)ctrl;
+
+
+        LLInventoryView* view = (LLInventoryView*)(quickfilter->getParent());
+        if (!view->mActivePanel)
+        {
+                return;
+        }
+
+
+        std::string item_type = quickfilter->getSimple();
+        U32 filter_type;
+
+        if (view->getString("filter_type_animation") == item_type)
+        {
+                filter_type = 0x1 << LLInventoryType::IT_ANIMATION;
+        }
+
+        else if (view->getString("filter_type_callingcard") == item_type)
+        {
+                filter_type = 0x1 << LLInventoryType::IT_CALLINGCARD;
+        }
+
+        else if (view->getString("filter_type_wearable") == item_type)
+        {
+                filter_type = 0x1 << LLInventoryType::IT_WEARABLE;
+        }
+
+        else if (view->getString("filter_type_gesture") == item_type)
+        {
+                filter_type = 0x1 << LLInventoryType::IT_GESTURE;
+        }
+
+        else if (view->getString("filter_type_landmark") == item_type)
+        {
+                filter_type = 0x1 << LLInventoryType::IT_LANDMARK;
+        }
+
+        else if (view->getString("filter_type_notecard") == item_type)
+        {
+                filter_type = 0x1 << LLInventoryType::IT_NOTECARD;
+        }
+
+        else if (view->getString("filter_type_object") == item_type)
+        {
+                filter_type = 0x1 << LLInventoryType::IT_OBJECT;
+        }
+
+        else if (view->getString("filter_type_script") == item_type)
+        {
+                filter_type = 0x1 << LLInventoryType::IT_LSL;
+        }
+
+        else if (view->getString("filter_type_sound") == item_type)
+        {
+                filter_type = 0x1 << LLInventoryType::IT_SOUND;
+        }
+
+        else if (view->getString("filter_type_texture") == item_type)
+        {
+                filter_type = 0x1 << LLInventoryType::IT_TEXTURE;
+        }
+
+        else if (view->getString("filter_type_snapshot") == item_type)
+        {
+                filter_type = 0x1 << LLInventoryType::IT_SNAPSHOT;
+        }
+
+        else if (view->getString("filter_type_custom") == item_type)
+        {
+                // When they select custom, show the floater then return
+                if( !(view->filtersVisible(view)) )
+                {
+                        view->toggleFindOptions();
+                }
+                return;
+        }
+
+        else if (view->getString("filter_type_all") == item_type)
+        {
+                // Show all types
+                filter_type = 0xffffffff;
+        }
+
+        else
+        {
+                llwarns << "Ignoring unknown filter: " << item_type << llendl;
+                return;
+        }
+
+        view->mActivePanel->setFilterTypes( filter_type );
+
+
+        // Force the filters window to update itself, if it's open.
+        LLInventoryViewFinder* finder = view->getFinder();
+        if( finder )
+        {
+                finder->updateElementsFromFilter();
+        }
+
+        // llinfos << "Quick Filter: " << item_type << llendl;
+
+}
+
+
+
+//static
+void LLInventoryView::refreshQuickFilter(LLUICtrl* ctrl)
+{
+
+        LLInventoryView* view = (LLInventoryView*)(ctrl->getParent());
+        if (!view->mActivePanel)
+        {
+                return;
+        }
+
+        LLComboBox* quickfilter = view->getChild<LLComboBox>("Quick Filter");
+        if (!quickfilter)
+        {
+                return;
+        }
+
+
+        U32 filter_type = view->mActivePanel->getFilterTypes();
+
+
+  // Mask to extract only the bit fields we care about.
+  // *TODO: There's probably a cleaner way to construct this mask.
+  U32 filter_mask = 0;
+  filter_mask |= (0x1 << LLInventoryType::IT_ANIMATION);
+  filter_mask |= (0x1 << LLInventoryType::IT_CALLINGCARD);
+  filter_mask |= (0x1 << LLInventoryType::IT_WEARABLE);
+  filter_mask |= (0x1 << LLInventoryType::IT_GESTURE);
+  filter_mask |= (0x1 << LLInventoryType::IT_LANDMARK);
+  filter_mask |= (0x1 << LLInventoryType::IT_NOTECARD);
+  filter_mask |= (0x1 << LLInventoryType::IT_OBJECT);
+  filter_mask |= (0x1 << LLInventoryType::IT_LSL);
+  filter_mask |= (0x1 << LLInventoryType::IT_SOUND);
+  filter_mask |= (0x1 << LLInventoryType::IT_TEXTURE);
+  filter_mask |= (0x1 << LLInventoryType::IT_SNAPSHOT);
+
+
+  filter_type &= filter_mask;
+
+
+  //llinfos << "filter_type: " << filter_type << llendl;
+
+        std::string selection;
+
+
+        if (filter_type == filter_mask)
+        {
+                selection = view->getString("filter_type_all");
+        }
+
+        else if (filter_type == (0x1 << LLInventoryType::IT_ANIMATION))
+        {
+                selection = view->getString("filter_type_animation");
+        }
+
+        else if (filter_type == (0x1 << LLInventoryType::IT_CALLINGCARD))
+        {
+                selection = view->getString("filter_type_callingcard");
+        }
+
+        else if (filter_type == (0x1 << LLInventoryType::IT_WEARABLE))
+        {
+                selection = view->getString("filter_type_wearable");
+        }
+
+        else if (filter_type == (0x1 << LLInventoryType::IT_GESTURE))
+        {
+                selection = view->getString("filter_type_gesture");
+        }
+
+        else if (filter_type == (0x1 << LLInventoryType::IT_LANDMARK))
+        {
+                selection = view->getString("filter_type_landmark");
+        }
+
+        else if (filter_type == (0x1 << LLInventoryType::IT_NOTECARD))
+        {
+                selection = view->getString("filter_type_notecard");
+        }
+
+        else if (filter_type == (0x1 << LLInventoryType::IT_OBJECT))
+        {
+                selection = view->getString("filter_type_object");
+        }
+
+        else if (filter_type == (0x1 << LLInventoryType::IT_LSL))
+        {
+                selection = view->getString("filter_type_script");
+        }
+
+        else if (filter_type == (0x1 << LLInventoryType::IT_SOUND))
+        {
+                selection = view->getString("filter_type_sound");
+        }
+
+        else if (filter_type == (0x1 << LLInventoryType::IT_TEXTURE))
+        {
+                selection = view->getString("filter_type_texture");
+        }
+
+        else if (filter_type == (0x1 << LLInventoryType::IT_SNAPSHOT))
+        {
+                selection = view->getString("filter_type_snapshot");
+        }
+
+        else
+        {
+                selection = view->getString("filter_type_custom");
+        }
+
+
+        // Select the chosen item by label text
+        BOOL result = quickfilter->setSimple( (selection) );
+
+  if( !result )
+  {
+    llinfos << "The item didn't exist: " << selection << llendl;
+  }
+
+}
+
+
+
 // static
 // BOOL LLInventoryView::incrementalFind(LLFolderViewItem* first_item, const char *find_text, BOOL backward)
 // {
diff --git a/linden/indra/newview/llinventoryview.h b/linden/indra/newview/llinventoryview.h
index a37d370..cce30aa 100644
--- a/linden/indra/newview/llinventoryview.h
+++ b/linden/indra/newview/llinventoryview.h
@@ -58,6 +58,7 @@ class LLCheckBoxCtrl;
 class LLSpinCtrl;
 class LLScrollableContainerView;
 class LLTextBox;
+class LLComboBox;
 class LLIconCtrl;
 class LLSaveFolderState;
 class LLSearchEditor;
@@ -239,6 +240,8 @@ public:
         static void onFoldersByName(void *user_data);
         static BOOL checkFoldersByName(void *user_data);
         static void onSearchEdit(const std::string& search_string, void* user_data );
+  static void onQuickFilterCommit(LLUICtrl* ctrl, void* user_data);
+  static void refreshQuickFilter(LLUICtrl* ctrl);
         static void onFilterSelected(void* userdata, bool from_click);
         static void onSelectionChange(const std::deque<LLFolderViewItem*> &items, BOOL user_action, void* data);
 
@@ -259,6 +262,7 @@ protected:
 
 protected:
         LLSearchEditor*                         mSearchEditor;
+        LLComboBox*                                             mQuickFilterCombo;
         LLTabContainer*                         mFilterTabs;
         LLHandle<LLFloater>                             mFinderHandle;
         LLInventoryPanel*                       mActivePanel;
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..9bcb848 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,62 @@
      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_callingcard">Calling Cards</string>
+        <string name="filter_type_wearable">Clothing / Body Parts</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_callingcard">Calling Cards</combo_item>
+                <combo_item name="filter_type_wearable">Clothing / Body Parts</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..befcc96 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,126 @@
 <?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="408" 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="-36" 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="-56" left="8" height="16" width="16" follows="left|top" />
+        <check_box label="Calling Cards" name="check_calling_card"
+             bottom="-56" 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="-76" left="8" height="16" width="16" follows="left|top" />
+        <check_box label="Clothing / Body Parts" name="check_clothing"
+             bottom="-76" 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="-96" left="8" height="16" width="16" follows="left|top" />
+        <check_box label="Gestures" name="check_gesture"
+             bottom="-96" 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="-116" left="8" height="16" width="16" follows="left|top" />
+        <check_box label="Landmarks" name="check_landmark"
+             bottom="-116" 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="-136" left="8" height="16" width="16" follows="left|top" />
+        <check_box label="Notecards" name="check_notecard"
+             bottom="-136" 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="-156" left="8" height="16" width="16" follows="left|top" />
+        <check_box label="Objects" name="check_object"
+             bottom="-156" 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="-176" left="8" height="16" width="16" follows="left|top" />
+        <check_box label="Scripts" name="check_script"
+             bottom="-176" 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="-196" left="8" height="16" width="16" follows="left|top" />
+        <check_box label="Sounds" name="check_sound"
+             bottom="-196" 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="-216" left="8" height="16" width="16" follows="left|top" />
+        <check_box label="Textures" name="check_texture"
+             bottom="-216" 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="-236" left="8" height="16" width="16" follows="left|top" />
+        <check_box label="Snapshots" name="check_snapshot"
+             bottom="-236" left="26" height="16" width="126" follows="left|top"
+             font="SansSerifSmall" initial_value="false" />
+
+
+        <button label="All" label_selected="All" name="All"
+             bottom="-260" 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="-284" 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="-304" left="8" height="16" width="144" follows="left|top"
+             font="SansSerifSmall" initial_value="false" />
+
+
+        <check_box label="Since Logoff" name="check_since_logoff" 
+             bottom="-324" left="8" height="16" width="144" follows="left|top"
+             font="SansSerifSmall" initial_value="false" />
+
+
+        <text name="- OR -" type="string" length="1"
+             bottom="-336" 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="-356" 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="-376" 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="-400" right="-6" height="20" width="76" follows="top|right"
+             font="SansSerif" halign="center" scale_image="true" />
 </floater>