From 798ba45606b4e4affcfde157ec64e877dd39e91c Mon Sep 17 00:00:00 2001
From: Sergei Litovchuk <slitovchuk@productengine.com>
Date: Wed, 23 Dec 2009 18:55:35 +0200
Subject: [PATCH] Fixed EXT-3348 "State of all folders (expanded/collapsed) in
"My Landmarks" tab isn't saved after switching to "Teleport History" tab and
back" - Disabled restoring folder state when empty filter is not changed.
--HG--
branch : product-engine
---
indra/newview/llpanellandmarks.cpp | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/indra/newview/llpanellandmarks.cpp b/indra/newview/llpanellandmarks.cpp
index 7b64f7e221a..6a982108305 100644
--- a/indra/newview/llpanellandmarks.cpp
+++ b/indra/newview/llpanellandmarks.cpp
@@ -985,7 +985,7 @@ void LLLandmarksPanel::doCreatePick(LLLandmark* landmark)
static void filter_list(LLInventorySubTreePanel* inventory_list, const std::string& string)
{
// When search is cleared, restore the old folder state.
- if (string == "")
+ if (!inventory_list->getRootFolder()->getFilterSubString().empty() && string == "")
{
inventory_list->setFilterSubString(LLStringUtil::null);
// Re-open folders that were open before
@@ -1010,7 +1010,6 @@ static void filter_list(LLInventorySubTreePanel* inventory_list, const std::stri
// Set new filter string
inventory_list->setFilterSubString(string);
-
}
static bool category_has_descendents(LLInventorySubTreePanel* inventory_list)
--
GitLab