From 7ca0d115a189a8c0768c8d29a3f5d1ed1c80d4a9 Mon Sep 17 00:00:00 2001 From: Sergei Litovchuk Date: Tue, 10 Aug 2010 17:39:03 +0300 Subject: Backed out changeset: e1e225cd1deb --HG-- branch : product-engine --- indra/newview/llfolderview.cpp | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/indra/newview/llfolderview.cpp b/indra/newview/llfolderview.cpp index 49d80a0249..be15ab7b98 100644 --- a/indra/newview/llfolderview.cpp +++ b/indra/newview/llfolderview.cpp @@ -561,9 +561,7 @@ void LLFolderView::addToSelectionList(LLFolderViewItem* item) void LLFolderView::removeFromSelectionList(LLFolderViewItem* item) { - // 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()) + if (mSelectedItems.size()) { mSelectedItems.back()->setIsCurSelection(FALSE); } -- cgit v1.2.3 From 8db6d855ec552657a6390f93af1f29d96b819bde Mon Sep 17 00:00:00 2001 From: Sergei Litovchuk Date: Tue, 10 Aug 2010 18:21:12 +0300 Subject: 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 --- indra/newview/llfolderview.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) 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; } -- cgit v1.2.3