From 56277fa43c6f6491d356c6fb8a0a0275d4cd00fc Mon Sep 17 00:00:00 2001
From: AlexanderP ProductEngine <apaschenko@productengine.com>
Date: Fri, 13 Jul 2012 20:24:44 +0300
Subject: [PATCH] CHUI-206 FIXED Viewer crash when selecting to cut inventory
item, then selecting to cut another inventory item
---
indra/newview/llfolderviewmodelinventory.cpp | 8 +++-----
1 file changed, 3 insertions(+), 5 deletions(-)
diff --git a/indra/newview/llfolderviewmodelinventory.cpp b/indra/newview/llfolderviewmodelinventory.cpp
index d23b4af8cb5..dff1e1be90f 100644
--- a/indra/newview/llfolderviewmodelinventory.cpp
+++ b/indra/newview/llfolderviewmodelinventory.cpp
@@ -158,22 +158,20 @@ 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