1 files changed, 46 insertions, 11 deletions

diff --git a/linden/indra/newview/llfolderview.cpp b/linden/indra/newview/llfolderview.cpp
index 5407f06..61d7df0 100644
--- a/linden/indra/newview/llfolderview.cpp
+++ b/linden/indra/newview/llfolderview.cpp
@@ -297,11 +297,22 @@ void LLFolderViewItem::refreshFromListener()
                 else
                         mLabelCreator = creator_name;*/
                 
+                //Label for desc search
+                std::string desc;
+                if(item)
+                {
+                        if(!item->getDescription().empty())
+                        {
+                                desc = item->getDescription();
+                        }
+                }
+                mLabelDesc = desc;
+
                 //Label for name search
                 mLabel = mListener->getDisplayName();
 
                 //Build label for combined search - RK
-                mLabelAll = mLabel + " " + mLabelCreator;
+                mLabelAll = mLabel + " " + mLabelCreator + " " + mLabelDesc;
 
                 setIcon(mListener->getIcon());
                 time_t creation_date = mListener->getCreationDate();
@@ -321,32 +332,53 @@ void LLFolderViewItem::refresh()
         
         std::string searchable_label(mLabel);
         std::string searchable_label_creator(mLabelCreator);
+        std::string searchable_label_desc(mLabelDesc);
         std::string searchable_label_all(mLabelAll);
 
         //add the (no modify), (no transfer) etc stuff to each label.
         searchable_label.append(mLabelSuffix);
         searchable_label_creator.append(mLabelSuffix);
+        searchable_label_desc.append(mLabelSuffix);
         searchable_label_all.append(mLabelSuffix);
 
         //all labels need to be uppercase.
         LLStringUtil::toUpper(searchable_label);
         LLStringUtil::toUpper(searchable_label_creator);
+        LLStringUtil::toUpper(searchable_label_desc);
         LLStringUtil::toUpper(searchable_label_all);
 
-        if (mSearchableLabel.compare(searchable_label) || 
-                mSearchableLabelCreator.compare(searchable_label_creator))
+        if (mSearchableLabel.compare(searchable_label) ||
+                mSearchableLabelCreator.compare(searchable_label_creator) ||
+                mSearchableLabelDesc.compare(searchable_label_creator))
         {
                 mSearchableLabel.assign(searchable_label);
                 mSearchableLabelCreator.assign(searchable_label_creator);
+                mSearchableLabelDesc.assign(searchable_label_desc);
                 mSearchableLabelAll.assign(searchable_label_all);
 
                 dirtyFilter();
-                // some part of label has changed, so overall width has potentially changed
+                //some part of label has changed, so overall width has potentially changed
                 if (mParentFolder)
-                {
                         mParentFolder->requestArrange();
-                }
         }
+        
+        /*if(mSearchableLabelCreator.compare(searchable_label_creator))
+        {
+                mSearchableLabelCreator.assign(searchable_label_creator);
+
+                dirtyFilter();
+                if(mParentFolder)
+                        mParentFolder->requestArrange();
+        }
+
+        if(mSearchableLabelDesc.compare(searchable_label_desc))
+        {
+                mSearchableLabelDesc.assign(searchable_label_desc);
+
+                dirtyFilter();
+                if(mParentFolder)
+                        mParentFolder->requestArrange();
+        }*/
 
         S32 label_width = sFont->getWidth(mLabel);
         if( mLabelSuffix.size() )   
@@ -621,11 +653,12 @@ void LLFolderViewItem::rename(const std::string& new_name)
         }
 }
 
-const std::string& LLFolderViewItem::getSearchableLabel() const
+const std::string& LLFolderViewItem::getSearchableLabel(U32 search_type = 0) const
 {
-        U32 search_type = gSavedSettings.getU32("InventorySearchType");
-        if(search_type == 4)
+        if(search_type == 3)
                 return mSearchableLabelAll;
+        else if(search_type == 2)
+                return mSearchableLabelDesc;
         else if(search_type == 1)
                 return mSearchableLabelCreator;
         else
@@ -4564,11 +4597,13 @@ BOOL LLInventoryFilter::check(LLFolderViewItem* item)
         }
         LLFolderViewEventListener* listener = item->getListener();
         const LLUUID& item_id = listener->getUUID();
-        mSubStringMatchOffset = mFilterSubString.size() ? item->getSearchableLabel().find(mFilterSubString) : std::string::npos;
+
+        U32 search_type = gSavedSettings.getU32("InventorySearchType");
+        mSubStringMatchOffset = mFilterSubString.size() ? item->getSearchableLabel(search_type).find(mFilterSubString) : std::string::npos;
         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))
+                                                (gAgent.getAvatarObject() && gAgent.getAvatarObject()->isWearingAttachment(item_id)))
                                         && ((listener->getPermissionMask() & mFilterOps.mPermissions) == mFilterOps.mPermissions)
                                         && (listener->getCreationDate() >= earliest && listener->getCreationDate() <= mFilterOps.mMaxDate);
         return passed;