diff options
| author | Josh Bell <josh@lindenlab.com> | 2007-06-04 18:46:59 +0000 |
|---|---|---|
| committer | Josh Bell <josh@lindenlab.com> | 2007-06-04 18:46:59 +0000 |
| commit | e61a10ec5b6b84fcb5c27e8e308022d0094f8736 (patch) | |
| tree | bcf6152629edb1b2548af039bd89b6b573e1e514 /indra/newview/llfolderview.cpp | |
| parent | 3e9872a297c3cf3f929e688e0e89a78f6bc050f5 (diff) | |
svn merge -r 62602:62831 svn+ssh://svn.lindenlab.com/svn/linden/branches/maintenance --> release
Diffstat (limited to 'indra/newview/llfolderview.cpp')
| -rw-r--r-- | indra/newview/llfolderview.cpp | 3 |
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; } |