summaryrefslogtreecommitdiff
path: root/indra/newview/llfolderview.cpp
diff options
context:
space:
mode:
authorDave Parks <davep@lindenlab.com>2010-03-01 15:25:35 -0600
committerDave Parks <davep@lindenlab.com>2010-03-01 15:25:35 -0600
commit99b0d17833a8a2efab9c08edf2ada3718736a5ba (patch)
tree8951e7aabe026917d299436ebc28019f9966cd02 /indra/newview/llfolderview.cpp
parent746037362ed07af0c799caf22cf9e425744359a0 (diff)
parent7564813d608f79e6fc70e1f58a861c640d1b6fa2 (diff)
Merge with viewer-2-0
Diffstat (limited to 'indra/newview/llfolderview.cpp')
-rw-r--r--indra/newview/llfolderview.cpp9
1 files changed, 9 insertions, 0 deletions
diff --git a/indra/newview/llfolderview.cpp b/indra/newview/llfolderview.cpp
index 7d527fa98a..23f19a38a6 100644
--- a/indra/newview/llfolderview.cpp
+++ b/indra/newview/llfolderview.cpp
@@ -2163,6 +2163,15 @@ void LLFolderView::doIdle()
LLSelectFirstFilteredItem filter;
applyFunctorRecursively(filter);
}
+
+ // Open filtered folders for folder views with mAutoSelectOverride=TRUE.
+ // Used by LLPlacesFolderView.
+ if (mAutoSelectOverride && !mFilter->getFilterSubString().empty())
+ {
+ LLOpenFilteredFolders filter;
+ applyFunctorRecursively(filter);
+ }
+
scrollToShowSelection();
}