From 6e4e971fd27826f90c1728c7fd17242083e230fc Mon Sep 17 00:00:00 2001
From: Richard Linden <none@none>
Date: Fri, 23 Mar 2012 18:31:09 -0700
Subject: [PATCH] EXP-1925 WIP Inventory folders being pasted to are hidden
during a paste operation potential fix by not changing mostfiltereddescendant
flag when dirtying folder as new contents arrive
---
indra/newview/llfolderviewitem.cpp | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/indra/newview/llfolderviewitem.cpp b/indra/newview/llfolderviewitem.cpp
index dce0981a3e7..d2b4866987e 100644
--- a/indra/newview/llfolderviewitem.cpp
+++ b/indra/newview/llfolderviewitem.cpp
@@ -1165,8 +1165,8 @@ S32 LLFolderViewFolder::arrange( S32* width, S32* height, S32 filter_generation)
}
// evaluate mHasVisibleChildren
- mHasVisibleChildren = hasFilteredDescendants(filter_generation);
- if (mHasVisibleChildren)
+ mHasVisibleChildren = false;
+ if (hasFilteredDescendants(filter_generation))
{
// We have to verify that there's at least one child that's not filtered out
bool found = false;
@@ -1192,6 +1192,7 @@ S32 LLFolderViewFolder::arrange( S32* width, S32* height, S32 filter_generation)
break;
}
}
+
mHasVisibleChildren = found;
}
@@ -1346,7 +1347,7 @@ void LLFolderViewFolder::requestSort()
void LLFolderViewFolder::setCompletedFilterGeneration(S32 generation, BOOL recurse_up)
{
- mMostFilteredDescendantGeneration = llmin(mMostFilteredDescendantGeneration, generation);
+ //mMostFilteredDescendantGeneration = llmin(mMostFilteredDescendantGeneration, generation);
mCompletedFilterGeneration = generation;
// only aggregate up if we are a lower (older) value
if (recurse_up
--
GitLab