From 089fc07d207c71ce1401e72f09c31ad8c45872e2 Mon Sep 17 00:00:00 2001
From: Jacek Antonelli
Date: Fri, 15 Aug 2008 23:44:58 -0500
Subject: Second Life viewer sources 1.17.0.12

---
 linden/indra/newview/llfolderview.cpp | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'linden/indra/newview/llfolderview.cpp')

diff --git a/linden/indra/newview/llfolderview.cpp b/linden/indra/newview/llfolderview.cpp
index ff0ad3f..bd5be8e 100644
--- a/linden/indra/newview/llfolderview.cpp
+++ b/linden/indra/newview/llfolderview.cpp
@@ -1921,7 +1921,7 @@ void LLFolderViewFolder::requestArrange(BOOL include_descendants)
 { 
 	mLastArrangeGeneration = -1; 
 	// flag all items up to root
-	if (mParentFolder && !mParentFolder->needsArrange())
+	if (mParentFolder)
 	{
 		mParentFolder->requestArrange();
 	}
@@ -4282,7 +4282,8 @@ void LLFolderView::idle(void* user_data)
 	{
 		self->scrollToShowItem(self->mSelectedItems.back());
 		// continue scrolling until animated layout change is done
-		if (!self->needsArrange() || !self->isInVisibleChain())
+		if (self->getCompletedFilterGeneration() >= self->mFilter.getMinRequiredGeneration() &&
+			(!self->needsArrange() || !self->isInVisibleChain()))
 		{
 			self->mNeedsScroll = FALSE;
 		}
-- 
cgit v1.1