summaryrefslogtreecommitdiff
path: root/indra/newview/llfolderview.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'indra/newview/llfolderview.cpp')
-rw-r--r--indra/newview/llfolderview.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/indra/newview/llfolderview.cpp b/indra/newview/llfolderview.cpp
index 14a4d7dc00..f712067492 100644
--- a/indra/newview/llfolderview.cpp
+++ b/indra/newview/llfolderview.cpp
@@ -4262,7 +4262,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;
}