summaryrefslogtreecommitdiff
path: root/indra/newview/llfolderviewmodelinventory.cpp
diff options
context:
space:
mode:
authorRichard Linden <none@none>2012-07-24 20:29:20 -0700
committerRichard Linden <none@none>2012-07-24 20:29:20 -0700
commit891a09561d4dff23836c8618d481a6cd2dd001de (patch)
tree05990baa16b210bf31dd23d2c55d14c20672cc42 /indra/newview/llfolderviewmodelinventory.cpp
parent1736c7b74e5291b1fee91ae72ff52391ae7d946f (diff)
CHUI-206 FIX Viewer crash when selecting to cut inventory item, then selecting to cut another inventory item
Seems to work now, without filtering de-optimization
Diffstat (limited to 'indra/newview/llfolderviewmodelinventory.cpp')
-rw-r--r--indra/newview/llfolderviewmodelinventory.cpp5
1 files changed, 0 insertions, 5 deletions
diff --git a/indra/newview/llfolderviewmodelinventory.cpp b/indra/newview/llfolderviewmodelinventory.cpp
index d23b4af8cb..faf5b3e7ac 100644
--- a/indra/newview/llfolderviewmodelinventory.cpp
+++ b/indra/newview/llfolderviewmodelinventory.cpp
@@ -163,11 +163,6 @@ bool LLFolderViewModelItemInventory::filterChildItem( LLFolderViewModelItem* ite
{
// 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