Merge branch 'develop' into rlva/base

1 files changed, 5 insertions, 3 deletions

diff --git a/indra/newview/llinventoryfilter.h b/indra/newview/llinventoryfilter.h
index 7203c6f743..7e64a03e73 100644
--- a/indra/newview/llinventoryfilter.h
+++ b/indra/newview/llinventoryfilter.h
@@ -45,7 +45,8 @@ public:
         SHOW_NO_FOLDERS
     };
 
-    enum EFilterType    {
+    enum EFilterType
+    {
         FILTERTYPE_NONE = 0,
         FILTERTYPE_OBJECT = 0x1 << 0,   // normal default search-by-object-type
         FILTERTYPE_CATEGORY = 0x1 << 1, // search by folder type
@@ -275,9 +276,9 @@ public:
     // +-------------------------------------------------------------------+
     // + Execution And Results
     // +-------------------------------------------------------------------+
-    bool                check(const LLFolderViewModelItem* listener);
+    bool                check(const LLFolderViewModelItem* item);
     bool                check(const LLInventoryItem* item);
-    bool                checkFolder(const LLFolderViewModelItem* listener) const;
+    bool                checkFolder(const LLFolderViewModelItem* item) const;
     bool                checkFolder(const LLUUID& folder_id) const;
 
     bool                showAllResults() const;
@@ -341,6 +342,7 @@ public:
 
 private:
     bool                areDateLimitsSet();
+    bool                checkAgainstFilterSubString(const std::string& desc) const;
     bool                checkAgainstFilterType(const class LLFolderViewModelItemInventory* listener) const;
     bool                checkAgainstFilterType(const LLInventoryItem* item) const;
     bool                checkAgainstPermissions(const class LLFolderViewModelItemInventory* listener) const;