From c03e22e420a17e47b597c90978eb2f4d206f2ffe Mon Sep 17 00:00:00 2001
From: andreykproductengine <akleshchev@productengine.com>
Date: Wed, 6 Aug 2014 17:50:40 +0300
Subject: [PATCH] MAINT-4325 FIXED [BEAR] Fix to "Reset Filters" causes empty
folders to appear in Recent tab of Inventory
---
indra/newview/llpanelmaininventory.cpp | 11 +++--------
1 file changed, 3 insertions(+), 8 deletions(-)
diff --git a/indra/newview/llpanelmaininventory.cpp b/indra/newview/llpanelmaininventory.cpp
index 2378e099794..ddf1a63c6e2 100755
--- a/indra/newview/llpanelmaininventory.cpp
+++ b/indra/newview/llpanelmaininventory.cpp
@@ -151,7 +151,9 @@ BOOL LLPanelMainInventory::postBuild()
recent_items_panel->setSinceLogoff(TRUE);
recent_items_panel->setSortOrder(LLInventoryFilter::SO_DATE);
recent_items_panel->setShowFolderState(LLInventoryFilter::SHOW_NON_EMPTY_FOLDERS);
- recent_items_panel->getFilter().markDefault();
+ LLInventoryFilter& recent_filter = recent_items_panel->getFilter();
+ recent_filter.setFilterObjectTypes(recent_filter.getFilterObjectTypes() & ~(0x1 << LLInventoryType::IT_CATEGORY));
+ recent_filter.markDefault();
recent_items_panel->setSelectCallback(boost::bind(&LLPanelMainInventory::onSelectionChange, this, recent_items_panel, _1, _2));
}
@@ -183,13 +185,6 @@ BOOL LLPanelMainInventory::postBuild()
}
- if (recent_items_panel)
- {
- U64 types = recent_items_panel->getFilter().getFilterObjectTypes();
- types &= ~(0x1 << LLInventoryType::IT_CATEGORY);
- recent_items_panel->getFilter().setFilterObjectTypes(types);
- }
-
mFilterEditor = getChild<LLFilterEditor>("inventory search editor");
if (mFilterEditor)
{
--
GitLab