diff options
| -rw-r--r-- | indra/newview/llfolderviewmodelinventory.cpp | 9 | ||||
| -rw-r--r-- | indra/newview/llfolderviewmodelinventory.h | 3 |
2 files changed, 2 insertions, 10 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(); diff --git a/indra/newview/llfolderviewmodelinventory.h b/indra/newview/llfolderviewmodelinventory.h index 540a87354d..10a958a142 100644 --- a/indra/newview/llfolderviewmodelinventory.h +++ b/indra/newview/llfolderviewmodelinventory.h @@ -103,8 +103,6 @@ class LLFolderViewModelInventory public: typedef LLFolderViewModel<LLInventorySort, LLFolderViewModelItemInventory, LLFolderViewModelItemInventory, LLInventoryFilter> base_t; - LLFolderViewModelInventory(); - void setTaskID(const LLUUID& id) {mTaskID = id;} void sort(LLFolderViewFolder* folder); @@ -113,6 +111,5 @@ public: private: LLUUID mTaskID; - S32 mModelInstance; }; #endif // LL_LLFOLDERVIEWMODELINVENTORY_H |