diff options
| author | simon@Simon-PC.lindenlab.com <simon@Simon-PC.lindenlab.com> | 2012-06-29 13:53:35 -0700 |
|---|---|---|
| committer | simon@Simon-PC.lindenlab.com <simon@Simon-PC.lindenlab.com> | 2012-06-29 13:53:35 -0700 |
| commit | a96a260a4dc9df6a16b3c917e2e2d2c13a4f7eea (patch) | |
| tree | 1d23ebbb1c6d8a10d43824b25d939372c7d1c354 /indra/newview/llfolderview.cpp | |
| parent | 37f73782d21e8a66b6ede0b0356e6394d3338162 (diff) | |
| parent | 4c4a23226a2db8b1dac5b8d6b8f1537fc9164cf6 (diff) | |
Merge simon/viewmaster-merge for latest maint work
Diffstat (limited to 'indra/newview/llfolderview.cpp')
| -rw-r--r-- | indra/newview/llfolderview.cpp | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/indra/newview/llfolderview.cpp b/indra/newview/llfolderview.cpp index 1fa194ab19..0965b7b533 100644 --- a/indra/newview/llfolderview.cpp +++ b/indra/newview/llfolderview.cpp @@ -2236,12 +2236,16 @@ void LLFolderView::doIdle() arrangeAll(); } + mNeedsAutoSelect = mFilter->hasFilterString() && + !(gFocusMgr.childHasKeyboardFocus(this) || gFocusMgr.getMouseCapture()); + + if (mFilter->isModified() && mFilter->isNotDefault()) { mNeedsAutoSelect = TRUE; } mFilter->clearModified(); - + // filter to determine visibility before arranging filterFromRoot(); |