diff options
| author | Merov Linden <merov@lindenlab.com> | 2013-01-07 18:30:59 -0800 |
|---|---|---|
| committer | Merov Linden <merov@lindenlab.com> | 2013-01-07 18:30:59 -0800 |
| commit | d71c0ab32c744a6672e4364e3d090d317ec0647c (patch) | |
| tree | da598b0ada10c3814429993e804db1f1ec0d9a93 /indra | |
| parent | 51d6589eedc408aa7f8a81009b1be356ddc99252 (diff) | |
CHUI-659 : WIP : Clamp down on the number of rearrange we really need.
Diffstat (limited to 'indra')
| -rwxr-xr-x | indra/llui/llfolderviewitem.cpp | 14 | ||||
| -rw-r--r-- | indra/newview/llfolderviewmodelinventory.cpp | 1 |
2 files changed, 7 insertions, 8 deletions
diff --git a/indra/llui/llfolderviewitem.cpp b/indra/llui/llfolderviewitem.cpp index 1281d6bd66..6f8bdb1919 100755 --- a/indra/llui/llfolderviewitem.cpp +++ b/indra/llui/llfolderviewitem.cpp @@ -1664,16 +1664,16 @@ void LLFolderViewFolder::addFolder(LLFolderViewFolder* folder) void LLFolderViewFolder::requestArrange() { - //if ( mLastArrangeGeneration != -1) + if ( mLastArrangeGeneration != -1) { - mLastArrangeGeneration = -1; - // flag all items up to root - if (mParentFolder) - { - mParentFolder->requestArrange(); - } + mLastArrangeGeneration = -1; + // flag all items up to root + if (mParentFolder) + { + mParentFolder->requestArrange(); } } +} void LLFolderViewFolder::toggleOpen() { diff --git a/indra/newview/llfolderviewmodelinventory.cpp b/indra/newview/llfolderviewmodelinventory.cpp index d47c28678d..586965e5a0 100644 --- a/indra/newview/llfolderviewmodelinventory.cpp +++ b/indra/newview/llfolderviewmodelinventory.cpp @@ -135,7 +135,6 @@ void LLFolderViewModelItemInventory::setPassedFilter(bool passed, S32 filter_gen if (passed_filter_before != mPrevPassedAllFilters) { - //TODO RN: ensure this still happens, but without dependency on folderview LLFolderViewFolder* parent_folder = mFolderViewItem->getParentFolder(); if (parent_folder) { |