summaryrefslogtreecommitdiff
path: root/indra/newview/llfolderviewmodelinventory.cpp
diff options
context:
space:
mode:
authorMerov Linden <merov@lindenlab.com>2013-04-19 19:02:21 -0700
committerMerov Linden <merov@lindenlab.com>2013-04-19 19:02:21 -0700
commitf59af8d27c419d97596fff65fb9aa412499c52be (patch)
tree8f38e88b837d450b4e206384f0ebe5d28485f33f /indra/newview/llfolderviewmodelinventory.cpp
parent2cc1fb250f78df3a4b8f33b13b30defef7efb78a (diff)
CHUI-912 : Some clean up of vestigial debug code
Diffstat (limited to 'indra/newview/llfolderviewmodelinventory.cpp')
-rw-r--r--indra/newview/llfolderviewmodelinventory.cpp9
1 files changed, 2 insertions, 7 deletions
diff --git a/indra/newview/llfolderviewmodelinventory.cpp b/indra/newview/llfolderviewmodelinventory.cpp
index 4a51d26693..e2a6eb78c6 100644
--- a/indra/newview/llfolderviewmodelinventory.cpp
+++ b/indra/newview/llfolderviewmodelinventory.cpp
@@ -35,12 +35,6 @@
// class LLFolderViewModelInventory
//
static LLFastTimer::DeclareTimer FTM_INVENTORY_SORT("Sort");
-static S32 sModelInstance = 0;
-
-LLFolderViewModelInventory::LLFolderViewModelInventory()
-{
- mModelInstance = sModelInstance++;
-}
bool LLFolderViewModelInventory::startDrag(std::vector<LLFolderViewModelItem*>& items)
{
@@ -137,8 +131,9 @@ void LLFolderViewModelItemInventory::setPassedFilter(bool passed, S32 filter_gen
{
bool before = passedFilter();
LLFolderViewModelItemCommon::setPassedFilter(passed, filter_generation, string_offset, string_size);
+ bool after = passedFilter();
- if (before != passed)
+ if (before != after)
{
// Need to rearrange the folder if the filtered state of the item changed
LLFolderViewFolder* parent_folder = mFolderViewItem->getParentFolder();