merge.

1 files changed, 11 insertions, 6 deletions

diff --git a/indra/newview/llinventoryfilter.cpp b/indra/newview/llinventoryfilter.cpp
index 7ec8d3d003..085c96c93d 100644
--- a/indra/newview/llinventoryfilter.cpp
+++ b/indra/newview/llinventoryfilter.cpp
@@ -100,13 +100,18 @@ BOOL LLInventoryFilter::check(LLFolderViewItem* item)
 	bool passed_type = false;
 	if (mFilterOps.mFilterForCategories)
 	{
-		if (listener->getInventoryType() == LLInventoryType::IT_CATEGORY)
+		// Pass if this item is a category of the filter type, or
+		// if its parent is a category of the filter type.
+		LLUUID uuid = listener->getUUID();
+		if (listener->getInventoryType() != LLInventoryType::IT_CATEGORY)
 		{
-			LLViewerInventoryCategory *cat = gInventory.getCategory(listener->getUUID());
-			if (cat)
-			{
-				passed_type |= ((1LL << cat->getPreferredType() & mFilterOps.mFilterTypes) != U64(0));
-			}
+			const LLInventoryObject *obj = gInventory.getObject(uuid);
+			uuid = obj->getParentUUID();
+		}
+		LLViewerInventoryCategory *cat = gInventory.getCategory(uuid);
+		if (cat)
+		{
+			passed_type |= ((1LL << cat->getPreferredType() & mFilterOps.mFilterTypes) != U64(0));
 		}
 	}
 	else