diff options
| author | voidpointer <none@none> | 2012-10-18 15:34:43 -0700 |
|---|---|---|
| committer | voidpointer <none@none> | 2012-10-18 15:34:43 -0700 |
| commit | 88fb47bf84b4e995ca36632fc9154cb5a3763def (patch) | |
| tree | ac984df2807dd321508eb2838b2386a215691b59 /indra/newview/llfolderview.cpp | |
| parent | 48b2dbcd65e72994054b9e525c0e45e346a981fb (diff) | |
| parent | 9cc1dfd4e6f3859e690da578adde057ec9a82e18 (diff) | |
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 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(); |