diff options
author | Don Kjer <don@lindenlab.com> | 2012-11-28 23:46:06 +0000 |
---|---|---|
committer | Don Kjer <don@lindenlab.com> | 2012-11-28 23:46:06 +0000 |
commit | 96ef49df75c0248e4843f9a5b53f010b819d59f3 (patch) | |
tree | 9f542fae939073bbb39464500d3fd477d1ed5fe5 /indra/newview/llfolderview.cpp | |
parent | dc71cae16b9c49a1d6b4d4a888c3a574049fd087 (diff) | |
parent | e0432f98ee515f9777604aa784d28b63d2abfe40 (diff) |
Automated merge
Diffstat (limited to 'indra/newview/llfolderview.cpp')
-rw-r--r-- | indra/newview/llfolderview.cpp | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/indra/newview/llfolderview.cpp b/indra/newview/llfolderview.cpp index 93f9c0a3f3..30de0ef664 100644 --- a/indra/newview/llfolderview.cpp +++ b/indra/newview/llfolderview.cpp @@ -2226,12 +2226,11 @@ void LLFolderView::doIdle() mDebugFilters = debug_filters; arrangeAll(); } - 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 filterFromRoot(); |