From d71c0ab32c744a6672e4364e3d090d317ec0647c Mon Sep 17 00:00:00 2001
From: Merov Linden <merov@lindenlab.com>
Date: Mon, 7 Jan 2013 18:30:59 -0800
Subject: [PATCH] CHUI-659 : WIP : Clamp down on the number of rearrange we
really need.
---
indra/llui/llfolderviewitem.cpp | 14 +++++++-------
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 1281d6bd66e..6f8bdb1919f 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 d47c28678d2..586965e5a00 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)
{
--
GitLab