summaryrefslogtreecommitdiff
path: root/indra/newview
diff options
context:
space:
mode:
authorSergei Litovchuk <slitovchuk@productengine.com>2009-12-23 18:55:35 +0200
committerSergei Litovchuk <slitovchuk@productengine.com>2009-12-23 18:55:35 +0200
commit798ba45606b4e4affcfde157ec64e877dd39e91c (patch)
tree80cf0ee263c5376e1519676897c934ce1c039c23 /indra/newview
parent75f6bdb469c01fbfb4b26603864d6616b70374f0 (diff)
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
Diffstat (limited to 'indra/newview')
-rw-r--r--indra/newview/llpanellandmarks.cpp3
1 files changed, 1 insertions, 2 deletions
diff --git a/indra/newview/llpanellandmarks.cpp b/indra/newview/llpanellandmarks.cpp
index 7b64f7e221..6a98210830 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)