From a3e549639130eec752d99db767eb1992cc3a0661 Mon Sep 17 00:00:00 2001 From: Sergei Litovchuk Date: Thu, 25 Feb 2010 22:49:37 +0200 Subject: Fixed normal bug (EXT-5729) My Landmarks search doesn't auto expand folders of found terms. --HG-- branch : product-engine --- indra/newview/llfolderview.cpp | 9 +++++++++ 1 file changed, 9 insertions(+) (limited to 'indra/newview/llfolderview.cpp') diff --git a/indra/newview/llfolderview.cpp b/indra/newview/llfolderview.cpp index 7d527fa98a..e50753c1c5 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() != "") + { + LLOpenFilteredFolders filter; + applyFunctorRecursively(filter); + } + scrollToShowSelection(); } -- cgit v1.2.3 From f3c49d3b7c4bc47c1c3aabde1b8c9c19441abaec Mon Sep 17 00:00:00 2001 From: Tofu Linden Date: Fri, 26 Feb 2010 11:16:14 +0000 Subject: minor stylistic tweak for code in EXT-5729 --- indra/newview/llfolderview.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'indra/newview/llfolderview.cpp') diff --git a/indra/newview/llfolderview.cpp b/indra/newview/llfolderview.cpp index e50753c1c5..23f19a38a6 100644 --- a/indra/newview/llfolderview.cpp +++ b/indra/newview/llfolderview.cpp @@ -2166,7 +2166,7 @@ void LLFolderView::doIdle() // Open filtered folders for folder views with mAutoSelectOverride=TRUE. // Used by LLPlacesFolderView. - if (mAutoSelectOverride && mFilter->getFilterSubString() != "") + if (mAutoSelectOverride && !mFilter->getFilterSubString().empty()) { LLOpenFilteredFolders filter; applyFunctorRecursively(filter); -- cgit v1.2.3