livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

CHUI-912 : Some clean up of vestigial debug code

meow-7.2.2
Merov Linden 2013-04-19 19:02:21 -07:00
parent 2cc1fb250f
commit f59af8d27c
2 changed files with 2 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
indra/newview/llfolderviewmodelinventory.cpp
View File

@ -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();

3
indra/newview/llfolderviewmodelinventory.h
View File

@ -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