From 1736c7b74e5291b1fee91ae72ff52391ae7d946f Mon Sep 17 00:00:00 2001
From: Richard Linden <none@none>
Date: Tue, 24 Jul 2012 15:19:18 -0700
Subject: [PATCH] Backed out changeset: a20e437a726c
---
indra/newview/llfolderviewmodelinventory.cpp | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
diff --git a/indra/newview/llfolderviewmodelinventory.cpp b/indra/newview/llfolderviewmodelinventory.cpp
index dff1e1be90f..d23b4af8cb5 100644
--- a/indra/newview/llfolderviewmodelinventory.cpp
+++ b/indra/newview/llfolderviewmodelinventory.cpp
@@ -158,20 +158,22 @@ bool LLFolderViewModelItemInventory::filterChildItem( LLFolderViewModelItem* ite
if (item->getLastFilterGeneration() < filter_generation)
{
- // recursive application of the filter for child items
- item->filter( filter );
-
if (item->getLastFilterGeneration() >= must_pass_generation
&& !item->passedFilter(must_pass_generation))
{
// failed to pass an earlier filter that was a subset of the current one
// go ahead and flag this item as done
+ item->filter(filter);
if (item->passedFilter())
{
llerrs << "Invalid shortcut in inventory filtering!" << llendl;
}
item->setPassedFilter(false, false, filter_generation);
}
+ else
+ {
+ item->filter( filter );
+ }
}
// track latest generation to pass any child items, for each folder up to root
--
GitLab