Skip to content
Snippets Groups Projects
Commit 798ba456 authored by Sergei Litovchuk's avatar Sergei Litovchuk
Browse files

Fixed EXT-3348 "State of all folders (expanded/collapsed) in "My Landmarks"...

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
parent 75f6bdb4
No related branches found
No related tags found
No related merge requests found
...@@ -985,7 +985,7 @@ void LLLandmarksPanel::doCreatePick(LLLandmark* landmark) ...@@ -985,7 +985,7 @@ void LLLandmarksPanel::doCreatePick(LLLandmark* landmark)
static void filter_list(LLInventorySubTreePanel* inventory_list, const std::string& string) static void filter_list(LLInventorySubTreePanel* inventory_list, const std::string& string)
{ {
// When search is cleared, restore the old folder state. // When search is cleared, restore the old folder state.
if (string == "") if (!inventory_list->getRootFolder()->getFilterSubString().empty() && string == "")
{ {
inventory_list->setFilterSubString(LLStringUtil::null); inventory_list->setFilterSubString(LLStringUtil::null);
// Re-open folders that were open before // Re-open folders that were open before
...@@ -1010,7 +1010,6 @@ static void filter_list(LLInventorySubTreePanel* inventory_list, const std::stri ...@@ -1010,7 +1010,6 @@ static void filter_list(LLInventorySubTreePanel* inventory_list, const std::stri
// Set new filter string // Set new filter string
inventory_list->setFilterSubString(string); inventory_list->setFilterSubString(string);
} }
static bool category_has_descendents(LLInventorySubTreePanel* inventory_list) static bool category_has_descendents(LLInventorySubTreePanel* inventory_list)
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment