diff options
| author | Northspring <pantera.polnocy@phoenixviewer.com> | 2015-04-15 00:23:36 +0200 |
|---|---|---|
| committer | Northspring <pantera.polnocy@phoenixviewer.com> | 2015-04-15 00:23:36 +0200 |
| commit | 49630f6bf56db8b2561d99cd71cfcf2b7bee9f90 (patch) | |
| tree | 2b44d1dde9392cf2e5eaa9cb60d2033f0d9bc355 /indra/llui/llfolderview.cpp | |
| parent | 079ad3b5767c444a29f97ca2e6b27fdb28f4b116 (diff) | |
| parent | a647b8f1cbab13f07ea889c80df28414bc906129 (diff) | |
Merge
Diffstat (limited to 'indra/llui/llfolderview.cpp')
| -rwxr-xr-x | indra/llui/llfolderview.cpp | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/indra/llui/llfolderview.cpp b/indra/llui/llfolderview.cpp index 474b545f00..00d553e457 100755 --- a/indra/llui/llfolderview.cpp +++ b/indra/llui/llfolderview.cpp @@ -1611,7 +1611,7 @@ void LLFolderView::update() LLFolderViewFilter& filter_object = getFolderViewModel()->getFilter(); - if (filter_object.isModified() && filter_object.isNotDefault()) + if (filter_object.isModified() && filter_object.isNotDefault() && mParentPanel.get()->getVisible()) { mNeedsAutoSelect = TRUE; } @@ -1653,8 +1653,10 @@ void LLFolderView::update() scrollToShowSelection(); } - BOOL filter_finished = getViewModelItem()->passedFilter() - && mViewModel->contentsReady(); + BOOL filter_finished = mViewModel->contentsReady() + && (getViewModelItem()->passedFilter() + || ( getViewModelItem()->getLastFilterGeneration() >= filter_object.getFirstSuccessGeneration() + && !filter_object.isModified())); if (filter_finished || gFocusMgr.childHasKeyboardFocus(mParentPanel.get()) || gFocusMgr.childHasMouseCapture(mParentPanel.get())) |