1 files changed, 45 insertions, 16 deletions

diff --git a/linden/indra/newview/llfolderview.cpp b/linden/indra/newview/llfolderview.cpp
index 1402d24..8e010b8 100644
--- a/linden/indra/newview/llfolderview.cpp
+++ b/linden/indra/newview/llfolderview.cpp
@@ -4480,7 +4480,7 @@ LLInventoryFilter::LLInventoryFilter(const std::string& name) :
         mModified(FALSE),
         mNeedTextRebuild(TRUE)
 {
-        mFilterOps.mFilterTypes = 0xffffffff;
+        mFilterOps.mFilterTypes = LLInventoryType::NIT_ALL;
         mFilterOps.mMinDate = time_min();
         mFilterOps.mMaxDate = time_max();
         mFilterOps.mHoursAgo = 0;
@@ -4491,6 +4491,7 @@ LLInventoryFilter::LLInventoryFilter(const std::string& name) :
 
         mSubStringMatchOffset = 0;
         mFilterSubString.clear();
+        mFilterWorn = false;
         mFilterGeneration = 0;
         mMustPassGeneration = S32_MAX;
         mMinRequiredGeneration = 0;
@@ -4522,9 +4523,12 @@ BOOL LLInventoryFilter::check(LLFolderViewItem* item)
                 earliest = 0;
         }
         LLFolderViewEventListener* listener = item->getListener();
+        const LLUUID& item_id = listener->getUUID();
         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)
+                                        && (mFilterWorn == false || gAgent.isWearingItem(item_id) ||
+                                                gAgent.getAvatarObject() && gAgent.getAvatarObject()->isWearingAttachment(item_id))
                                         && ((listener->getPermissionMask() & mFilterOps.mPermissions) == mFilterOps.mPermissions)
                                         && (listener->getCreationDate() >= earliest && listener->getCreationDate() <= mFilterOps.mMaxDate);
         return passed;
@@ -4545,6 +4549,7 @@ BOOL LLInventoryFilter::isNotDefault()
 {
         return mFilterOps.mFilterTypes != mDefaultFilterOps.mFilterTypes 
                 || mFilterSubString.size() 
+                || mFilterWorn
                 || mFilterOps.mPermissions != mDefaultFilterOps.mPermissions
                 || mFilterOps.mMinDate != mDefaultFilterOps.mMinDate 
                 || mFilterOps.mMaxDate != mDefaultFilterOps.mMaxDate
@@ -4553,8 +4558,9 @@ BOOL LLInventoryFilter::isNotDefault()
 
 BOOL LLInventoryFilter::isActive()
 {
-        return mFilterOps.mFilterTypes != 0xffffffff 
+        return mFilterOps.mFilterTypes != LLInventoryType::NIT_ALL
                 || mFilterSubString.size() 
+                || mFilterWorn
                 || mFilterOps.mPermissions != PERM_NONE 
                 || mFilterOps.mMinDate != time_min()
                 || mFilterOps.mMaxDate != time_max()
@@ -4801,9 +4807,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()
@@ -4813,6 +4819,11 @@ std::string LLInventoryFilter::getFilterText()
                 return mFilterText;
         }
 
+  return rebuildFilterText();
+}
+
+std::string LLInventoryFilter::rebuildFilterText()
+{
         mNeedTextRebuild = FALSE;
         std::string filtered_types;
         std::string not_filtered_types;
@@ -4821,7 +4832,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;
@@ -4833,7 +4844,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;
@@ -4845,7 +4868,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;
@@ -4857,7 +4880,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;
@@ -4869,7 +4892,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;
@@ -4881,7 +4904,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;
@@ -4893,7 +4916,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;
@@ -4905,7 +4928,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;
@@ -4917,7 +4940,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;
@@ -4929,7 +4952,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;
@@ -4941,7 +4964,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;
@@ -4973,6 +4996,12 @@ std::string LLInventoryFilter::getFilterText()
         {
                 mFilterText += " - Since Logoff";
         }
+        
+        if (getFilterWorn())
+        {
+                mFilterText += " - Worn";
+        }
+        
         return mFilterText;
 }