summaryrefslogtreecommitdiff
path: root/indra/newview
diff options
context:
space:
mode:
authorSergei Litovchuk <slitovchuk@productengine.com>2010-08-10 18:21:12 +0300
committerSergei Litovchuk <slitovchuk@productengine.com>2010-08-10 18:21:12 +0300
commitf88890afe5fa45e25f196a2546620102935887aa (patch)
tree55bf1ada4a436b86c640d8c1a5fe2cb88406492f /indra/newview
parent11517b83205c0b9029f2151d57a7917b4b4e7063 (diff)
EXT-3981 FIXED changeset e1e225cd1deb. Disabled folder view automatic scrolling while background fetch is in progress.
Reviewed by Loren Shih at https://codereview.productengine.com/secondlife/r/835/. --HG-- branch : product-engine
Diffstat (limited to 'indra/newview')
-rw-r--r--indra/newview/llfolderview.cpp4
1 files changed, 3 insertions, 1 deletions
diff --git a/indra/newview/llfolderview.cpp b/indra/newview/llfolderview.cpp
index be15ab7b98..e8891d1cc5 100644
--- a/indra/newview/llfolderview.cpp
+++ b/indra/newview/llfolderview.cpp
@@ -1979,7 +1979,9 @@ void LLFolderView::deleteAllChildren()
void LLFolderView::scrollToShowSelection()
{
- if (mSelectedItems.size())
+ // If items are filtered while background fetch is in progress
+ // scrollbar resets to the first filtered item. See EXT-3981.
+ if (!LLInventoryModelBackgroundFetch::instance().backgroundFetchActive() && mSelectedItems.size())
{
mNeedsScroll = TRUE;
}