summaryrefslogtreecommitdiff
path: root/indra/llui
diff options
context:
space:
mode:
authorandreykproductengine <akleshchev@productengine.com>2016-04-27 18:06:57 +0300
committerandreykproductengine <akleshchev@productengine.com>2016-04-27 18:06:57 +0300
commitb493edd2c32273b767d8bc3177b3b662947a5655 (patch)
tree11c2567849d1c4d06d7532a06f474ebabf71e11c /indra/llui
parent8d9f1ca337bc566511e9f65f82228235857903a8 (diff)
MAINT-204 Fixed Top folder is expanded when my inventory filter is changed
Diffstat (limited to 'indra/llui')
-rwxr-xr-xindra/llui/llfolderview.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/llui/llfolderview.cpp b/indra/llui/llfolderview.cpp
index 3282c5f726..8166ef6a07 100755
--- a/indra/llui/llfolderview.cpp
+++ b/indra/llui/llfolderview.cpp
@@ -1629,9 +1629,9 @@ void LLFolderView::update()
if (mNeedsAutoSelect)
{
LL_RECORD_BLOCK_TIME(FTM_AUTO_SELECT);
- // select new item only if a filtered item not currently selected
+ // select new item only if a filtered item not currently selected and there was a selection
LLFolderViewItem* selected_itemp = mSelectedItems.empty() ? NULL : mSelectedItems.back();
- if (!mAutoSelectOverride && (!selected_itemp || !selected_itemp->getViewModelItem()->potentiallyVisible()))
+ if (!mAutoSelectOverride && selected_itemp && !selected_itemp->getViewModelItem()->potentiallyVisible())
{
// these are named variables to get around gcc not binding non-const references to rvalues
// and functor application is inherently non-const to allow for stateful functors