diff options
| author | andreykproductengine <akleshchev@productengine.com> | 2014-10-30 19:02:06 +0200 |
|---|---|---|
| committer | andreykproductengine <akleshchev@productengine.com> | 2014-10-30 19:02:06 +0200 |
| commit | 0ab5b90e4b0e9d9fb02a4cf7d54fd8443299ece8 (patch) | |
| tree | e81556b99e7f944af004332ae5fdf326cf0599d1 /indra | |
| parent | 70a53351b15d1fb127a128941ed39b34a74e1116 (diff) | |
MAINT-4617 FIXED Viewer chews on "Inventory->Open and Select" until inventory received or recent items selected
Diffstat (limited to 'indra')
| -rwxr-xr-x | indra/llui/llfolderview.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/indra/llui/llfolderview.cpp b/indra/llui/llfolderview.cpp index 474b545f00..410b40920f 100755 --- a/indra/llui/llfolderview.cpp +++ b/indra/llui/llfolderview.cpp @@ -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())) |