From e9fcaa09e0817a34056fc049c6d8317bec7ec74d Mon Sep 17 00:00:00 2001 From: Loren Shih Date: Tue, 8 Dec 2009 15:06:39 -0500 Subject: For EXT-3166 : MyInventory/Library Places accordions are causing massive inventory background fetch on startup Took out line to start background fetch at start of filter; the background fetch will start when the filter is started. This prevents the viewer from requesting a complete inventory fetch at login. --HG-- branch : avatar-pipeline --- indra/newview/llpanellandmarks.cpp | 2 -- 1 file changed, 2 deletions(-) (limited to 'indra/newview/llpanellandmarks.cpp') diff --git a/indra/newview/llpanellandmarks.cpp b/indra/newview/llpanellandmarks.cpp index e87b70f6a5..ebde902e81 100644 --- a/indra/newview/llpanellandmarks.cpp +++ b/indra/newview/llpanellandmarks.cpp @@ -1003,8 +1003,6 @@ static void filter_list(LLInventorySubTreePanel* inventory_list, const std::stri inventory_list->restoreFolderState(); } - gInventory.startBackgroundFetch(); - if (inventory_list->getFilterSubString().empty() && string.empty()) { // current filter and new filter empty, do nothing -- cgit v1.2.3 From 947260880713f0bd65b03f796f782b167127e294 Mon Sep 17 00:00:00 2001 From: Loren Shih Date: Tue, 8 Dec 2009 18:19:39 -0500 Subject: EXT-3256 : Show help message in Favorites bar if empty --HG-- branch : avatar-pipeline --- indra/newview/llpanellandmarks.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'indra/newview/llpanellandmarks.cpp') diff --git a/indra/newview/llpanellandmarks.cpp b/indra/newview/llpanellandmarks.cpp index ebde902e81..975219458f 100644 --- a/indra/newview/llpanellandmarks.cpp +++ b/indra/newview/llpanellandmarks.cpp @@ -327,7 +327,7 @@ void LLLandmarksPanel::initFavoritesInventoryPanel() mFavoritesInventoryPanel = getChild("favorites_list"); initLandmarksPanel(mFavoritesInventoryPanel); - + mFavoritesInventoryPanel->getFilter()->setEmptyLookupMessage("FavoritesNoMatchingItems"); initAccordion("tab_favorites", mFavoritesInventoryPanel); } -- cgit v1.2.3 From 96d5f52624d68768592893ee0b27a0589b0f6222 Mon Sep 17 00:00:00 2001 From: Loren Shih Date: Wed, 9 Dec 2009 14:47:52 -0500 Subject: EXT-3274 : Landmarks or Favorites accordion panel shows up as empty EXT-1609 : Strange behavior for accordions in Places panel, Landmarks tab Forcing top-level folders open when accordion is active. Removed logic that was saving and restoring initial folder state. --HG-- branch : avatar-pipeline --- indra/newview/llpanellandmarks.cpp | 20 ++++++-------------- 1 file changed, 6 insertions(+), 14 deletions(-) (limited to 'indra/newview/llpanellandmarks.cpp') diff --git a/indra/newview/llpanellandmarks.cpp b/indra/newview/llpanellandmarks.cpp index 975219458f..c85fab2092 100644 --- a/indra/newview/llpanellandmarks.cpp +++ b/indra/newview/llpanellandmarks.cpp @@ -389,10 +389,6 @@ void LLLandmarksPanel::initLandmarksPanel(LLInventorySubTreePanel* inventory_lis } root_folder->setParentLandmarksPanel(this); - - // save initial folder state to avoid incorrect work while switching between Landmarks & Teleport History tabs - // See EXT-1609. - inventory_list->saveFolderState(); } void LLLandmarksPanel::initAccordion(const std::string& accordion_tab_name, LLInventorySubTreePanel* inventory_list) @@ -995,12 +991,13 @@ void LLLandmarksPanel::doCreatePick(LLLandmark* landmark) ////////////////////////////////////////////////////////////////////////// static void filter_list(LLInventorySubTreePanel* inventory_list, const std::string& string) { + // Open the immediate children of the root folder, since those + // are invisible in the UI and thus must always be open. + inventory_list->getRootFolder()->openTopLevelFolders(); + if (string == "") { inventory_list->setFilterSubString(LLStringUtil::null); - - // re-open folders that were initially open - inventory_list->restoreFolderState(); } if (inventory_list->getFilterSubString().empty() && string.empty()) @@ -1009,13 +1006,8 @@ static void filter_list(LLInventorySubTreePanel* inventory_list, const std::stri return; } - // save current folder open state if no filter currently applied - if (inventory_list->getRootFolder()->getFilterSubString().empty()) - { - inventory_list->saveFolderState(); - } - - // set new filter string + // Set new filter string inventory_list->setFilterSubString(string); + } // EOF -- cgit v1.2.3