diff options
| author | Merov Linden <merov@lindenlab.com> | 2012-08-10 15:35:48 -0700 |
|---|---|---|
| committer | Merov Linden <merov@lindenlab.com> | 2012-08-10 15:35:48 -0700 |
| commit | 1b639c33c59bb460881e6ef9dcd5fcfabbd21e18 (patch) | |
| tree | f064204174493b87e341c4116f99dad494500515 | |
| parent | c63dea6b91508bc87dc1423260ce1ebab3910f27 (diff) | |
VWR-29358 : Fix auto scroll to selection when the filter is active
| -rw-r--r-- | indra/newview/llfolderview.cpp | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/indra/newview/llfolderview.cpp b/indra/newview/llfolderview.cpp index 3ffa08ec32..d4080ab3f7 100644 --- a/indra/newview/llfolderview.cpp +++ b/indra/newview/llfolderview.cpp @@ -2235,14 +2235,9 @@ void LLFolderView::doIdle() arrangeAll(); } - mNeedsAutoSelect = mFilter->hasFilterString() && - !(gFocusMgr.childHasKeyboardFocus(this) || gFocusMgr.getMouseCapture()); - - - if (mFilter->isModified() && mFilter->isNotDefault()) - { - mNeedsAutoSelect = TRUE; - } + BOOL filter_modified_and_active = mFilter->isModified() && mFilter->isNotDefault(); + mNeedsAutoSelect = filter_modified_and_active && + !(gFocusMgr.childHasKeyboardFocus(this) || gFocusMgr.getMouseCapture()); mFilter->clearModified(); // filter to determine visibility before arranging |