diff options
| author | William Todd Stinson <stinson@lindenlab.com> | 2012-09-25 16:51:28 -0700 |
|---|---|---|
| committer | William Todd Stinson <stinson@lindenlab.com> | 2012-09-25 16:51:28 -0700 |
| commit | 79deb8c73562301f1bc6cb38167e0da751920b61 (patch) | |
| tree | f4a5516746aa204dbbc3fd0c57354448c617cabe /indra/newview/llfolderview.cpp | |
| parent | ae10e78d978360871556b1cee615cd79ef381184 (diff) | |
| parent | cb5a0a5686799ec834f16a0bc273d24f62140753 (diff) | |
Pull and merge from https://bitbucket.org/lindenlab/viewer-development.
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 d4080ab3f7..8e540a0cc8 100644 --- a/indra/newview/llfolderview.cpp +++ b/indra/newview/llfolderview.cpp @@ -2234,12 +2234,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(); |