From b740891b1f19c3d0e9ee494ef3bdb8adc3dcb151 Mon Sep 17 00:00:00 2001
From: maksymsproductengine <maksymsproductengine@lindenlab.com>
Date: Fri, 15 Aug 2014 19:40:21 +0300
Subject: [PATCH] MAINT-4293 [BEAR] Very slow inventory fetch on Bear compared
to current release: this change-set will does this issue not [BEAR] and
reverts most part of fix for MAINT-1192.
---
indra/newview/llinventorypanel.cpp | 6 ------
indra/newview/llpanelmaininventory.cpp | 4 +---
2 files changed, 1 insertion(+), 9 deletions(-)
diff --git a/indra/newview/llinventorypanel.cpp b/indra/newview/llinventorypanel.cpp
index 32e5675f5ea..ce7d4f50add 100755
--- a/indra/newview/llinventorypanel.cpp
+++ b/indra/newview/llinventorypanel.cpp
@@ -337,12 +337,6 @@ void LLInventoryPanel::setFilterTypes(U64 types, LLInventoryFilter::EFilterType
{
if (filter_type == LLInventoryFilter::FILTERTYPE_OBJECT)
{
- //Don't show folder without recent item in it
- if ("Recent Items" == getName())
- {
- types &= ~(0x1 << LLInventoryType::IT_CATEGORY);
- }
-
getFilter().setFilterObjectTypes(types);
}
if (filter_type == LLInventoryFilter::FILTERTYPE_CATEGORY)
diff --git a/indra/newview/llpanelmaininventory.cpp b/indra/newview/llpanelmaininventory.cpp
index ddf1a63c6e2..90dfb24377a 100755
--- a/indra/newview/llpanelmaininventory.cpp
+++ b/indra/newview/llpanelmaininventory.cpp
@@ -151,9 +151,7 @@ BOOL LLPanelMainInventory::postBuild()
recent_items_panel->setSinceLogoff(TRUE);
recent_items_panel->setSortOrder(LLInventoryFilter::SO_DATE);
recent_items_panel->setShowFolderState(LLInventoryFilter::SHOW_NON_EMPTY_FOLDERS);
- LLInventoryFilter& recent_filter = recent_items_panel->getFilter();
- recent_filter.setFilterObjectTypes(recent_filter.getFilterObjectTypes() & ~(0x1 << LLInventoryType::IT_CATEGORY));
- recent_filter.markDefault();
+ recent_items_panel->getFilter().markDefault();
recent_items_panel->setSelectCallback(boost::bind(&LLPanelMainInventory::onSelectionChange, this, recent_items_panel, _1, _2));
}
--
GitLab