SL-19544 preparation for Combination view

1 files changed, 34 insertions, 0 deletions

diff --git a/indra/newview/llinventoryfilter.cpp b/indra/newview/llinventoryfilter.cpp
index 5a300bad32..5c02b61522 100644
--- a/indra/newview/llinventoryfilter.cpp
+++ b/indra/newview/llinventoryfilter.cpp
@@ -63,6 +63,7 @@ LLInventoryFilter::FilterOps::FilterOps(const Params& p)
 	mFilterTypes(p.types),
 	mFilterUUID(p.uuid),
 	mFilterLinks(p.links),
+    mFilterThumbnails(p.thumbnails),
 	mSearchVisibility(p.search_visibility)
 {
 }
@@ -158,6 +159,8 @@ bool LLInventoryFilter::check(const LLFolderViewModelItem* item)
 	passed = passed && checkAgainstCreator(listener);
 	passed = passed && checkAgainstSearchVisibility(listener);
 
+    passed = passed && checkAgainstFilterThumbnails(listener->getUUID());
+
 	return passed;
 }
 
@@ -567,6 +570,19 @@ bool LLInventoryFilter::checkAgainstFilterLinks(const LLFolderViewModelItemInven
 	return TRUE;
 }
 
+bool LLInventoryFilter::checkAgainstFilterThumbnails(const LLUUID& object_id) const
+{
+    const LLInventoryObject *object = gInventory.getObject(object_id);
+    if (!object) return true;
+
+    const bool is_thumbnail = object->getThumbnailUUID().notNull();
+    if (is_thumbnail && (mFilterOps.mFilterThumbnails == FILTER_EXCLUDE_THUMBNAILS))
+        return false;
+    if (!is_thumbnail && (mFilterOps.mFilterThumbnails == FILTER_ONLY_THUMBNAILS))
+        return false;
+    return true;
+}
+
 bool LLInventoryFilter::checkAgainstCreator(const LLFolderViewModelItemInventory* listener) const
 {
 	if (!listener) return TRUE;
@@ -738,6 +754,19 @@ void LLInventoryFilter::setFilterSettingsTypes(U64 types)
     mFilterOps.mFilterTypes |= FILTERTYPE_SETTINGS;
 }
 
+void LLInventoryFilter::setFilterThumbnails(U64 filter_thumbnails)
+{
+    if (mFilterOps.mFilterThumbnails != filter_thumbnails)
+    {
+        if (mFilterOps.mFilterThumbnails == FILTER_EXCLUDE_THUMBNAILS ||
+            mFilterOps.mFilterThumbnails == FILTER_ONLY_THUMBNAILS)
+            setModified(FILTER_MORE_RESTRICTIVE);
+        else
+            setModified(FILTER_LESS_RESTRICTIVE);
+    }
+    mFilterOps.mFilterThumbnails = filter_thumbnails;
+}
+
 void LLInventoryFilter::setFilterEmptySystemFolders()
 {
 	mFilterOps.mFilterTypes |= FILTERTYPE_EMPTYFOLDERS;
@@ -1526,6 +1555,11 @@ U64 LLInventoryFilter::getSearchVisibilityTypes() const
 	return mFilterOps.mSearchVisibility;
 }
 
+U64 LLInventoryFilter::getFilterThumbnails() const
+{
+    return mFilterOps.mFilterThumbnails;
+}
+
 bool LLInventoryFilter::hasFilterString() const
 {
 	return mFilterSubString.size() > 0;