livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

MAINT-4617 FIXED Viewer chews on "Inventory->Open and Select" until inventory received or recent items selected

meow-7.2.2
andreykproductengine 2014-10-30 19:02:06 +02:00
parent 70a53351b1
commit 0ab5b90e4b
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
indra/llui/llfolderview.cpp
View File

@ -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()))