merged in jacek's quickfilter and gstreamer branches

11 files changed, 642 insertions, 254 deletions

diff --git a/linden/indra/newview/llfolderview.cpp b/linden/indra/newview/llfolderview.cpp
index 8cefd5b..58d0c42 100644
--- a/linden/indra/newview/llfolderview.cpp
+++ b/linden/indra/newview/llfolderview.cpp
@@ -4522,7 +4522,7 @@ BOOL LLInventoryFilter::check(LLFolderViewItem* item)
         }
         LLFolderViewEventListener* listener = item->getListener();
         mSubStringMatchOffset = mFilterSubString.size() ? item->getSearchableLabel().find(mFilterSubString) : std::string::npos;
-        BOOL passed = (0x1 << listener->getInventoryType() & mFilterOps.mFilterTypes || listener->getInventoryType() == LLInventoryType::IT_NONE)
+        BOOL passed = (listener->getNInventoryType() & mFilterOps.mFilterTypes || listener->getNInventoryType() == LLInventoryType::NIT_NONE)
                                         && (mFilterSubString.size() == 0 || mSubStringMatchOffset != std::string::npos)
                                         && ((listener->getPermissionMask() & mFilterOps.mPermissions) == mFilterOps.mPermissions)
                                         && (listener->getCreationDate() >= earliest && listener->getCreationDate() <= mFilterOps.mMaxDate);
@@ -4800,9 +4800,9 @@ void LLInventoryFilter::setModified(EFilterBehavior behavior)
         }
 }
 
-BOOL LLInventoryFilter::isFilterWith(LLInventoryType::EType t)
+BOOL LLInventoryFilter::isFilterWith(LLInventoryType::NType t)
 {
-        return mFilterOps.mFilterTypes & (0x01 << t);
+        return mFilterOps.mFilterTypes & t;
 }
 
 std::string LLInventoryFilter::getFilterText()
@@ -4812,6 +4812,11 @@ std::string LLInventoryFilter::getFilterText()
                 return mFilterText;
         }
 
+  return rebuildFilterText();
+}
+
+std::string LLInventoryFilter::rebuildFilterText()
+{
         mNeedTextRebuild = FALSE;
         std::string filtered_types;
         std::string not_filtered_types;
@@ -4820,7 +4825,7 @@ std::string LLInventoryFilter::getFilterText()
         S32 num_filter_types = 0;
         mFilterText.clear();
 
-        if (isFilterWith(LLInventoryType::IT_ANIMATION))
+        if (isFilterWith(LLInventoryType::NIT_ANIMATION))
         {
                 filtered_types += " Animations,";
                 filtered_by_type = TRUE;
@@ -4832,7 +4837,19 @@ std::string LLInventoryFilter::getFilterText()
                 filtered_by_all_types = FALSE;
         }
 
-        if (isFilterWith(LLInventoryType::IT_CALLINGCARD))
+        if (isFilterWith(LLInventoryType::NIT_BODYPART))
+        {
+                filtered_types += " Body Parts,";
+                filtered_by_type = TRUE;
+                num_filter_types++;
+        }
+        else
+        {
+                not_filtered_types += " Body Parts,";
+                filtered_by_all_types = FALSE;
+        }
+
+        if (isFilterWith(LLInventoryType::NIT_CALLCARD))
         {
                 filtered_types += " Calling Cards,";
                 filtered_by_type = TRUE;
@@ -4844,7 +4861,7 @@ std::string LLInventoryFilter::getFilterText()
                 filtered_by_all_types = FALSE;
         }
 
-        if (isFilterWith(LLInventoryType::IT_WEARABLE))
+        if (isFilterWith(LLInventoryType::NIT_CLOTHING))
         {
                 filtered_types += " Clothing,";
                 filtered_by_type = TRUE;
@@ -4856,7 +4873,7 @@ std::string LLInventoryFilter::getFilterText()
                 filtered_by_all_types = FALSE;
         }
 
-        if (isFilterWith(LLInventoryType::IT_GESTURE))
+        if (isFilterWith(LLInventoryType::NIT_GESTURE))
         {
                 filtered_types += " Gestures,";
                 filtered_by_type = TRUE;
@@ -4868,7 +4885,7 @@ std::string LLInventoryFilter::getFilterText()
                 filtered_by_all_types = FALSE;
         }
 
-        if (isFilterWith(LLInventoryType::IT_LANDMARK))
+        if (isFilterWith(LLInventoryType::NIT_LANDMARK))
         {
                 filtered_types += " Landmarks,";
                 filtered_by_type = TRUE;
@@ -4880,7 +4897,7 @@ std::string LLInventoryFilter::getFilterText()
                 filtered_by_all_types = FALSE;
         }
 
-        if (isFilterWith(LLInventoryType::IT_NOTECARD))
+        if (isFilterWith(LLInventoryType::NIT_NOTECARD))
         {
                 filtered_types += " Notecards,";
                 filtered_by_type = TRUE;
@@ -4892,7 +4909,7 @@ std::string LLInventoryFilter::getFilterText()
                 filtered_by_all_types = FALSE;
         }
         
-        if (isFilterWith(LLInventoryType::IT_OBJECT) && isFilterWith(LLInventoryType::IT_ATTACHMENT))
+        if (isFilterWith(LLInventoryType::NIT_OBJECT))
         {
                 filtered_types += " Objects,";
                 filtered_by_type = TRUE;
@@ -4904,7 +4921,7 @@ std::string LLInventoryFilter::getFilterText()
                 filtered_by_all_types = FALSE;
         }
         
-        if (isFilterWith(LLInventoryType::IT_LSL))
+        if (isFilterWith(LLInventoryType::NIT_SCRIPT_LSL2))
         {
                 filtered_types += " Scripts,";
                 filtered_by_type = TRUE;
@@ -4916,7 +4933,7 @@ std::string LLInventoryFilter::getFilterText()
                 filtered_by_all_types = FALSE;
         }
         
-        if (isFilterWith(LLInventoryType::IT_SOUND))
+        if (isFilterWith(LLInventoryType::NIT_SOUND))
         {
                 filtered_types += " Sounds,";
                 filtered_by_type = TRUE;
@@ -4928,7 +4945,7 @@ std::string LLInventoryFilter::getFilterText()
                 filtered_by_all_types = FALSE;
         }
 
-        if (isFilterWith(LLInventoryType::IT_TEXTURE))
+        if (isFilterWith(LLInventoryType::NIT_TEXTURE))
         {
                 filtered_types += " Textures,";
                 filtered_by_type = TRUE;
@@ -4940,7 +4957,7 @@ std::string LLInventoryFilter::getFilterText()
                 filtered_by_all_types = FALSE;
         }
 
-        if (isFilterWith(LLInventoryType::IT_SNAPSHOT))
+        if (isFilterWith(LLInventoryType::NIT_SNAPSHOT))
         {
                 filtered_types += " Snapshots,";
                 filtered_by_type = TRUE;
diff --git a/linden/indra/newview/llfolderview.h b/linden/indra/newview/llfolderview.h
index 7978386..af3248d 100644
--- a/linden/indra/newview/llfolderview.h
+++ b/linden/indra/newview/llfolderview.h
@@ -103,6 +103,7 @@ public:
         virtual BOOL isUpToDate() const = 0;
         virtual BOOL hasChildren() const = 0;
         virtual LLInventoryType::EType getInventoryType() const = 0;
+        virtual LLInventoryType::NType getNInventoryType() const = 0;
         virtual void performAction(LLFolderView* folder, LLInventoryModel* model, std::string action) {}
 
         // This method should be called when a drag begins. returns TRUE
@@ -221,6 +222,7 @@ public:
         void clearModified() { mModified = FALSE; mFilterBehavior = FILTER_NONE; }
         const std::string getName() const { return mName; }
         std::string getFilterText();
+  std::string rebuildFilterText();
 
         void setFilterCount(S32 count) { mFilterCount = count; }
         S32 getFilterCount() { return mFilterCount; }
@@ -229,7 +231,7 @@ public:
         void markDefault();
         void resetDefault();
 
-        BOOL isFilterWith(LLInventoryType::EType t);
+        BOOL isFilterWith(LLInventoryType::NType t);
 
         S32 getCurrentGeneration() const { return mFilterGeneration; }
         S32 getMinRequiredGeneration() const { return mMinRequiredGeneration; }
diff --git a/linden/indra/newview/llinventorybridge.cpp b/linden/indra/newview/llinventorybridge.cpp
index 12670e2..bde36cc 100644
--- a/linden/indra/newview/llinventorybridge.cpp
+++ b/linden/indra/newview/llinventorybridge.cpp
@@ -722,6 +722,7 @@ LLInvFVBridge* LLInvFVBridge::createBridge(LLAssetType::EType asset_type,
         if (new_listener)
         {
                 new_listener->mInvType = inv_type;
+                new_listener->mNInvType = calc_ntype(inv_type, asset_type, flags);
         }
 
         return new_listener;
diff --git a/linden/indra/newview/llinventorybridge.h b/linden/indra/newview/llinventorybridge.h
index fc04b28..329e57f 100644
--- a/linden/indra/newview/llinventorybridge.h
+++ b/linden/indra/newview/llinventorybridge.h
@@ -192,7 +192,15 @@ public:
         virtual BOOL dragOrDrop(MASK mask, BOOL drop,
                                                         EDragAndDropType cargo_type,
                                                         void* cargo_data) { return FALSE; }
-        virtual LLInventoryType::EType getInventoryType() const { return mInvType; }
+
+        virtual LLInventoryType::EType getInventoryType() const
+        {
+                return mInvType;
+        }
+        virtual LLInventoryType::NType getNInventoryType() const
+        {
+                return mNInvType;
+        }
 
         // LLInvFVBridge functionality
         virtual void clearDisplayName() {}
@@ -221,6 +229,7 @@ protected:
         LLInventoryPanel* mInventoryPanel;
         LLUUID mUUID;   // item id
         LLInventoryType::EType mInvType;
+        LLInventoryType::NType mNInvType;
 };
 
 
diff --git a/linden/indra/newview/llinventoryview.cpp b/linden/indra/newview/llinventoryview.cpp
index f9dd70d..52c3b7e 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"
@@ -181,18 +182,19 @@ void LLInventoryViewFinder::updateElementsFromFilter()
 
         // update the ui elements
         LLFloater::setTitle(mFilter->getName());
-        childSetValue("check_animation", (S32) (filter_types & 0x1 << LLInventoryType::IT_ANIMATION));
-
-        childSetValue("check_calling_card", (S32) (filter_types & 0x1 << LLInventoryType::IT_CALLINGCARD));
-        childSetValue("check_clothing", (S32) (filter_types & 0x1 << LLInventoryType::IT_WEARABLE));
-        childSetValue("check_gesture", (S32) (filter_types & 0x1 << LLInventoryType::IT_GESTURE));
-        childSetValue("check_landmark", (S32) (filter_types & 0x1 << LLInventoryType::IT_LANDMARK));
-        childSetValue("check_notecard", (S32) (filter_types & 0x1 << LLInventoryType::IT_NOTECARD));
-        childSetValue("check_object", (S32) (filter_types & 0x1 << LLInventoryType::IT_OBJECT));
-        childSetValue("check_script", (S32) (filter_types & 0x1 << LLInventoryType::IT_LSL));
-        childSetValue("check_sound", (S32) (filter_types & 0x1 << LLInventoryType::IT_SOUND));
-        childSetValue("check_texture", (S32) (filter_types & 0x1 << LLInventoryType::IT_TEXTURE));
-        childSetValue("check_snapshot", (S32) (filter_types & 0x1 << LLInventoryType::IT_SNAPSHOT));
+
+        childSetValue("check_animation", (S32) (filter_types & LLInventoryType::NIT_ANIMATION));
+        childSetValue("check_bodypart", (S32) (filter_types & LLInventoryType::NIT_BODYPART));
+        childSetValue("check_calling_card", (S32) (filter_types & LLInventoryType::NIT_CALLCARD));
+        childSetValue("check_clothing", (S32) (filter_types & LLInventoryType::NIT_CLOTHING));
+        childSetValue("check_gesture", (S32) (filter_types & LLInventoryType::NIT_GESTURE));
+        childSetValue("check_landmark", (S32) (filter_types & LLInventoryType::NIT_LANDMARK));
+        childSetValue("check_notecard", (S32) (filter_types & LLInventoryType::NIT_NOTECARD));
+        childSetValue("check_object", (S32) (filter_types & LLInventoryType::NIT_OBJECT));
+        childSetValue("check_script", (S32) (filter_types & LLInventoryType::NIT_SCRIPT_LSL2));
+        childSetValue("check_sound", (S32) (filter_types & LLInventoryType::NIT_SOUND));
+        childSetValue("check_texture", (S32) (filter_types & LLInventoryType::NIT_TEXTURE));
+        childSetValue("check_snapshot", (S32) (filter_types & LLInventoryType::NIT_SNAPSHOT));
         childSetValue("check_show_empty", show_folders == LLInventoryFilter::SHOW_ALL_FOLDERS);
         childSetValue("check_since_logoff", mFilter->isSinceLogoff());
         mSpinSinceHours->set((F32)(hours % 24));
@@ -206,26 +208,31 @@ void LLInventoryViewFinder::draw()
 
         if (!childGetValue("check_animation"))
         {
-                filter &= ~(0x1 << LLInventoryType::IT_ANIMATION);
+                filter &= ~(LLInventoryType::NIT_ANIMATION);
                 filtered_by_all_types = FALSE;
         }
 
+        if (!childGetValue("check_bodypart"))
+        {
+                filter &= ~(LLInventoryType::NIT_BODYPART);
+                filtered_by_all_types = FALSE;
+        }
 
         if (!childGetValue("check_calling_card"))
         {
-                filter &= ~(0x1 << LLInventoryType::IT_CALLINGCARD);
+                filter &= ~(LLInventoryType::NIT_CALLCARD);
                 filtered_by_all_types = FALSE;
         }
 
         if (!childGetValue("check_clothing"))
         {
-                filter &= ~(0x1 << LLInventoryType::IT_WEARABLE);
+                filter &= ~(LLInventoryType::NIT_CLOTHING);
                 filtered_by_all_types = FALSE;
         }
 
         if (!childGetValue("check_gesture"))
         {
-                filter &= ~(0x1 << LLInventoryType::IT_GESTURE);
+                filter &= ~(LLInventoryType::NIT_GESTURE);
                 filtered_by_all_types = FALSE;
         }
 
@@ -233,52 +240,53 @@ void LLInventoryViewFinder::draw()
 
 
         {
-                filter &= ~(0x1 << LLInventoryType::IT_LANDMARK);
+                filter &= ~(LLInventoryType::NIT_LANDMARK);
                 filtered_by_all_types = FALSE;
         }
 
         if (!childGetValue("check_notecard"))
         {
-                filter &= ~(0x1 << LLInventoryType::IT_NOTECARD);
+                filter &= ~(LLInventoryType::NIT_NOTECARD);
                 filtered_by_all_types = FALSE;
         }
 
         if (!childGetValue("check_object"))
         {
-                filter &= ~(0x1 << LLInventoryType::IT_OBJECT);
-                filter &= ~(0x1 << LLInventoryType::IT_ATTACHMENT);
+                filter &= ~(LLInventoryType::NIT_OBJECT);
                 filtered_by_all_types = FALSE;
         }
 
         if (!childGetValue("check_script"))
         {
-                filter &= ~(0x1 << LLInventoryType::IT_LSL);
+                filter &= ~(LLInventoryType::NIT_SCRIPT_LSL2);
                 filtered_by_all_types = FALSE;
         }
 
         if (!childGetValue("check_sound"))
         {
-                filter &= ~(0x1 << LLInventoryType::IT_SOUND);
+                filter &= ~(LLInventoryType::NIT_SOUND);
                 filtered_by_all_types = FALSE;
         }
 
         if (!childGetValue("check_texture"))
         {
-                filter &= ~(0x1 << LLInventoryType::IT_TEXTURE);
+                filter &= ~(LLInventoryType::NIT_TEXTURE);
                 filtered_by_all_types = FALSE;
         }
 
         if (!childGetValue("check_snapshot"))
         {
-                filter &= ~(0x1 << LLInventoryType::IT_SNAPSHOT);
+                filter &= ~(LLInventoryType::NIT_SNAPSHOT);
                 filtered_by_all_types = FALSE;
         }
 
+  /*
         if (!filtered_by_all_types)
         {
                 // don't include folders in filter, unless I've selected everything
-                filter &= ~(0x1 << LLInventoryType::IT_CATEGORY);
+                filter &= ~(LLInventoryType::NIT_CATEGORY);
         }
+  */
 
         // update the panel, panel will update the filter
         mInventoryView->mActivePanel->setShowFolderState(getCheckShowEmpty() ?
@@ -344,6 +352,7 @@ void LLInventoryViewFinder::selectAllTypes(void* user_data)
         if(!self) return;
 
         self->childSetValue("check_animation", TRUE);
+        self->childSetValue("check_bodypart", TRUE);
         self->childSetValue("check_calling_card", TRUE);
         self->childSetValue("check_clothing", TRUE);
         self->childSetValue("check_gesture", TRUE);
@@ -389,6 +398,7 @@ void LLInventoryViewFinder::selectNoTypes(void* user_data)
 
 
         self->childSetValue("check_animation", FALSE);
+        self->childSetValue("check_bodypart", FALSE);
         self->childSetValue("check_calling_card", FALSE);
         self->childSetValue("check_clothing", FALSE);
         self->childSetValue("check_gesture", FALSE);
@@ -549,6 +559,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 +633,11 @@ void LLInventoryView::draw()
         {
                 mSearchEditor->setText(mActivePanel->getFilterSubString());
         }
+        if (mActivePanel && mQuickFilterCombo)
+        {
+                refreshQuickFilter( mQuickFilterCombo );
+        }
+
         LLFloater::draw();
 }
 
@@ -922,16 +943,9 @@ void LLInventoryView::onClearSearch(void* user_data)
         LLInventoryView* self = (LLInventoryView*)user_data;
         if(!self) return;
 
-        LLFloater *finder = self->getFinder();
         if (self->mActivePanel)
         {
                 self->mActivePanel->setFilterSubString(LLStringUtil::null);
-                self->mActivePanel->setFilterTypes(0xffffffff);
-        }
-
-        if (finder)
-        {
-                LLInventoryViewFinder::selectAllTypes(finder);
         }
 
         // re-open folders that were initially open
@@ -981,6 +995,241 @@ 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 = LLInventoryType::NIT_ANIMATION;
+        }
+
+        else if (view->getString("filter_type_bodypart") == item_type)
+        {
+                filter_type = LLInventoryType::NIT_BODYPART;
+        }
+
+        else if (view->getString("filter_type_callingcard") == item_type)
+        {
+                filter_type = LLInventoryType::NIT_CALLCARD;
+        }
+
+        else if (view->getString("filter_type_clothing") == item_type)
+        {
+                filter_type = LLInventoryType::NIT_CLOTHING;
+        }
+
+        else if (view->getString("filter_type_gesture") == item_type)
+        {
+                filter_type = LLInventoryType::NIT_GESTURE;
+        }
+
+        else if (view->getString("filter_type_landmark") == item_type)
+        {
+                filter_type = LLInventoryType::NIT_LANDMARK;
+        }
+
+        else if (view->getString("filter_type_notecard") == item_type)
+        {
+                filter_type = LLInventoryType::NIT_NOTECARD;
+        }
+
+        else if (view->getString("filter_type_object") == item_type)
+        {
+                filter_type = LLInventoryType::NIT_OBJECT;
+        }
+
+        else if (view->getString("filter_type_script") == item_type)
+        {
+                filter_type = LLInventoryType::NIT_SCRIPT_LSL2;
+        }
+
+        else if (view->getString("filter_type_sound") == item_type)
+        {
+                filter_type = LLInventoryType::NIT_SOUND;
+        }
+
+        else if (view->getString("filter_type_texture") == item_type)
+        {
+                filter_type = LLInventoryType::NIT_TEXTURE;
+        }
+
+        else if (view->getString("filter_type_snapshot") == item_type)
+        {
+                filter_type = LLInventoryType::NIT_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 );
+
+        // Start fetching inventory in the background, so we have
+        // some items to show the user.
+        gInventory.startBackgroundFetch();
+
+        // Update the Inventory window text
+        view->setFilterTextFromFilter();
+
+        // 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();
+  filter_type &= LLInventoryType::NIT_ALL;
+
+
+  //llinfos << "filter_type: " << filter_type << llendl;
+
+        std::string selection;
+
+
+        if (filter_type == LLInventoryType::NIT_ALL)
+        {
+                selection = view->getString("filter_type_all");
+        }
+
+  else if (filter_type == LLInventoryType::NIT_NONE)
+  {
+                selection = view->getString("filter_type_custom");
+  }
+
+        else if (filter_type == (filter_type & LLInventoryType::NIT_ANIMATION))
+        {
+                selection = view->getString("filter_type_animation");
+        }
+
+        else if (filter_type == (filter_type & LLInventoryType::NIT_BODYPART))
+        {
+                selection = view->getString("filter_type_bodypart");
+        }
+
+        else if (filter_type == (filter_type & LLInventoryType::NIT_CALLCARD))
+        {
+                selection = view->getString("filter_type_callingcard");
+        }
+
+        else if (filter_type == (filter_type & LLInventoryType::NIT_CLOTHING))
+        {
+                selection = view->getString("filter_type_clothing");
+        }
+
+        else if (filter_type == (filter_type & LLInventoryType::NIT_GESTURE))
+        {
+                selection = view->getString("filter_type_gesture");
+        }
+
+        else if (filter_type == (filter_type & LLInventoryType::NIT_LANDMARK))
+        {
+                selection = view->getString("filter_type_landmark");
+        }
+
+        else if (filter_type == (filter_type & LLInventoryType::NIT_NOTECARD))
+        {
+                selection = view->getString("filter_type_notecard");
+        }
+
+        else if (filter_type == (filter_type & LLInventoryType::NIT_OBJECT))
+        {
+                selection = view->getString("filter_type_object");
+        }
+
+        else if (filter_type == (filter_type & LLInventoryType::NIT_SCRIPT_LSL2))
+        {
+                selection = view->getString("filter_type_script");
+        }
+
+        else if (filter_type == (filter_type & LLInventoryType::NIT_SOUND))
+        {
+                selection = view->getString("filter_type_sound");
+        }
+
+        else if (filter_type == (filter_type & LLInventoryType::NIT_TEXTURE))
+        {
+                selection = view->getString("filter_type_texture");
+        }
+
+        else if (filter_type == (filter_type & LLInventoryType::NIT_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)
 // {
@@ -1079,124 +1328,163 @@ BOOL LLInventoryView::handleDragAndDrop(S32 x, S32 y, MASK mask, BOOL drop,
 
         return handled;
 }
+
 std::string get_item_icon_name(LLAssetType::EType asset_type,
-                                                         LLInventoryType::EType inventory_type,
-                                                         U32 attachment_point,
-                                                         BOOL item_is_multi )
+                               LLInventoryType::EType inv_type,
+                               U32 flags,
+                               BOOL item_is_multi )
+{
+        return get_item_icon_name( calc_ntype(inv_type, asset_type, flags),
+                                   item_is_multi );
+}
+
+std::string get_item_icon_name(LLInventoryType::NType inv_ntype,
+                               BOOL item_is_multi )
 {
         EInventoryIcon idx = OBJECT_ICON_NAME;
-        if ( item_is_multi )
-        {
-                idx = OBJECT_MULTI_ICON_NAME;
-        }
-        
-        switch(asset_type)
+
+        switch( inv_ntype )
         {
-        case LLAssetType::AT_TEXTURE:
-                if(LLInventoryType::IT_SNAPSHOT == inventory_type)
-                {
-                        idx = SNAPSHOT_ICON_NAME;
-                }
-                else
-                {
-                        idx = TEXTURE_ICON_NAME;
-                }
-                break;
+                // BODY PARTS
 
-        case LLAssetType::AT_SOUND:
-                idx = SOUND_ICON_NAME;
-                break;
-        case LLAssetType::AT_CALLINGCARD:
-                if(attachment_point!= 0)
-                {
-                        idx = CALLINGCARD_ONLINE_ICON_NAME;
-                }
-                else
-                {
-                        idx = CALLINGCARD_OFFLINE_ICON_NAME;
-                }
-                break;
-        case LLAssetType::AT_LANDMARK:
-                if(attachment_point!= 0)
-                {
-                        idx = LANDMARK_VISITED_ICON_NAME;
-                }
-                else
-                {
-                        idx = LANDMARK_ICON_NAME;
-                }
-                break;
-        case LLAssetType::AT_SCRIPT:
-        case LLAssetType::AT_LSL_TEXT:
-        case LLAssetType::AT_LSL_BYTECODE:
-                idx = SCRIPT_ICON_NAME;
-                break;
-        case LLAssetType::AT_CLOTHING:
-                idx = CLOTHING_ICON_NAME;
-        case LLAssetType::AT_BODYPART :
-                if(LLAssetType::AT_BODYPART == asset_type)
-                {
-                        idx = BODYPART_ICON_NAME;
-                }
-                switch(attachment_point)
-                {
-                case WT_SHAPE:
+                case LLInventoryType::NIT_SHAPE:
                         idx = BODYPART_SHAPE_ICON_NAME;
                         break;
-                case WT_SKIN:
+                case LLInventoryType::NIT_SKIN:
                         idx = BODYPART_SKIN_ICON_NAME;
                         break;
-                case WT_HAIR:
+                case LLInventoryType::NIT_HAIR:
                         idx = BODYPART_HAIR_ICON_NAME;
                         break;
-                case WT_EYES:
+                case LLInventoryType::NIT_EYES:
                         idx = BODYPART_EYES_ICON_NAME;
                         break;
-                case WT_SHIRT:
+
+                case LLInventoryType::NIT_BODYPART:
+                        idx = BODYPART_ICON_NAME;
+                        break;
+
+
+                // CLOTHING
+
+                case LLInventoryType::NIT_SHIRT:
                         idx = CLOTHING_SHIRT_ICON_NAME;
                         break;
-                case WT_PANTS:
+                case LLInventoryType::NIT_PANTS:
                         idx = CLOTHING_PANTS_ICON_NAME;
                         break;
-                case WT_SHOES:
+                case LLInventoryType::NIT_SHOES:
                         idx = CLOTHING_SHOES_ICON_NAME;
                         break;
-                case WT_SOCKS:
+                case LLInventoryType::NIT_SOCKS:
                         idx = CLOTHING_SOCKS_ICON_NAME;
                         break;
-                case WT_JACKET:
+                case LLInventoryType::NIT_JACKET:
                         idx = CLOTHING_JACKET_ICON_NAME;
                         break;
-                case WT_GLOVES:
+                case LLInventoryType::NIT_GLOVES:
                         idx = CLOTHING_GLOVES_ICON_NAME;
                         break;
-                case WT_UNDERSHIRT:
+                case LLInventoryType::NIT_UNDERSHIRT:
                         idx = CLOTHING_UNDERSHIRT_ICON_NAME;
                         break;
-                case WT_UNDERPANTS:
+                case LLInventoryType::NIT_UNDERPANTS:
                         idx = CLOTHING_UNDERPANTS_ICON_NAME;
                         break;
-                case WT_SKIRT:
+                case LLInventoryType::NIT_SKIRT:
                         idx = CLOTHING_SKIRT_ICON_NAME;
                         break;
+
+                case LLInventoryType::NIT_CLOTHING:
+                        idx = CLOTHING_ICON_NAME;
+                        break;
+
+
+                // TEXTURES / SNAPSHOTS
+
+                case LLInventoryType::NIT_SNAPSHOT:
+                        idx = SNAPSHOT_ICON_NAME;
+                        break;
+                case LLInventoryType::NIT_TEXTURE:
+                case LLInventoryType::NIT_IMAGE:
+                        idx = TEXTURE_ICON_NAME;
+                        break;
+
+
+                // CALLING CARDS
+
+                case LLInventoryType::NIT_CALLCARD_ON:
+                        idx = CALLINGCARD_ONLINE_ICON_NAME;
+                        break;
+                case LLInventoryType::NIT_CALLCARD_OFF:
+                case LLInventoryType::NIT_CALLCARD:
+                        idx = CALLINGCARD_OFFLINE_ICON_NAME;
+                        break;
+
+
+                // LANDMARKS
+
+                case LLInventoryType::NIT_LANDMARK_USED:
+                        idx = LANDMARK_VISITED_ICON_NAME;
+                        break;
+                case LLInventoryType::NIT_LANDMARK_UNUSED:
+                case LLInventoryType::NIT_LANDMARK:
+                        idx = LANDMARK_ICON_NAME;
+                        break;
+
+
+                // SOUNDS
+
+                case LLInventoryType::NIT_SOUND:
+                        idx = SOUND_ICON_NAME;
+                        break;
+
+
+                // ANIMATIONS
+
+                case LLInventoryType::NIT_ANIMATION:
+                        idx = ANIMATION_ICON_NAME;
+                        break;
+
+
+                // GESTURES
+
+                case LLInventoryType::NIT_GESTURE:
+                        idx = GESTURE_ICON_NAME;
+                        break;
+
+
+                // NOTECARD
+
+                case LLInventoryType::NIT_NOTECARD:
+                        idx = NOTECARD_ICON_NAME;
+                        break;
+
+
+                // SCRIPTS
+
+                case LLInventoryType::NIT_SCRIPT_LSL2:
+                        idx = SCRIPT_ICON_NAME;
+                        break;
+
+
+                // OBJECTS
+
+                case LLInventoryType::NIT_OBJECT:
+                        if( item_is_multi )
+                        {
+                                idx = OBJECT_MULTI_ICON_NAME;
+                        }
+                        else
+                        {
+                                idx = OBJECT_ICON_NAME;
+                        }
+                        break;
+
                 default:
-                        // no-op, go with choice above
                         break;
-                }
-                break;
-        case LLAssetType::AT_NOTECARD:
-                idx = NOTECARD_ICON_NAME;
-                break;
-        case LLAssetType::AT_ANIMATION:
-                idx = ANIMATION_ICON_NAME;
-                break;
-        case LLAssetType::AT_GESTURE:
-                idx = GESTURE_ICON_NAME;
-                break;
-        default:
-                break;
         }
-        
+
         return ICON_NAME[idx];
 }
 
diff --git a/linden/indra/newview/llinventoryview.h b/linden/indra/newview/llinventoryview.h
index a37d370..80e5768 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;
@@ -344,6 +348,9 @@ std::string get_item_icon_name(LLAssetType::EType asset_type,
                                                          U32 attachment_point, 
                                                          BOOL item_is_multi );
 
+std::string get_item_icon_name(LLInventoryType::NType inv_ntype,
+                                                         BOOL item_is_multi );
+
 LLUIImagePtr get_item_icon(LLAssetType::EType asset_type,
                                                          LLInventoryType::EType inventory_type,
                                                          U32 attachment_point, 
diff --git a/linden/indra/newview/llpanelinventory.cpp b/linden/indra/newview/llpanelinventory.cpp
index 3c0e6d7..e41ecdc 100644
--- a/linden/indra/newview/llpanelinventory.cpp
+++ b/linden/indra/newview/llpanelinventory.cpp
@@ -146,6 +146,7 @@ public:
         virtual BOOL isUpToDate() const { return TRUE; }
         virtual BOOL hasChildren() const { return FALSE; }
         virtual LLInventoryType::EType getInventoryType() const { return LLInventoryType::IT_NONE; }
+        virtual LLInventoryType::NType getNInventoryType() const { return LLInventoryType::NIT_NONE; }
         // LLDragAndDropBridge functionality
         virtual BOOL startDrag(EDragAndDropType* type, LLUUID* id) const;
         virtual BOOL dragOrDrop(MASK mask, BOOL drop,
diff --git a/linden/indra/newview/llselectmgr.cpp b/linden/indra/newview/llselectmgr.cpp
index 90b1bd3..7547dd2 100644
--- a/linden/indra/newview/llselectmgr.cpp
+++ b/linden/indra/newview/llselectmgr.cpp
@@ -5499,6 +5499,10 @@ void LLSelectMgr::updateSelectionCenter()
 
                 std::vector < LLViewerObject *> jointed_objects;
 
+                // Initialize the bounding box to the root prim, so the BBox orientation
+                // matches the root prim's (affecting the orientation of the manipulators).
+                bbox.addBBoxAgent( (mSelectedObjects->getFirstRootObject(TRUE))->getBoundingBoxAgent() );
+
                 for (LLObjectSelection::iterator iter = mSelectedObjects->begin();
                          iter != mSelectedObjects->end(); iter++)
                 {
diff --git a/linden/indra/newview/llwearable.h b/linden/indra/newview/llwearable.h
index c5f9d06..00a53d3 100644
--- a/linden/indra/newview/llwearable.h
+++ b/linden/indra/newview/llwearable.h
@@ -37,28 +37,10 @@
 #include "llpermissions.h"
 #include "llsaleinfo.h"
 #include "llassetstorage.h"
+#include "llwearabletype.h"
 
 class LLViewerInventoryItem;
 
-enum    EWearableType  // If you change this, update LLWearable::getTypeName(), getTypeLabel(), and LLVOAvatar::getTEWearableType()
-{
-        WT_SHAPE        = 0,
-        WT_SKIN         = 1,
-        WT_HAIR         = 2,
-        WT_EYES         = 3,
-        WT_SHIRT        = 4,
-        WT_PANTS        = 5,
-        WT_SHOES        = 6,
-        WT_SOCKS        = 7,
-        WT_JACKET       = 8,
-        WT_GLOVES       = 9,
-        WT_UNDERSHIRT = 10,
-        WT_UNDERPANTS = 11,
-        WT_SKIRT        = 12,
-        WT_COUNT        = 13,
-        WT_INVALID      = 255
-};
-
 class LLWearable
 {
         friend class LLWearableList;
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>