summaryrefslogtreecommitdiff
path: root/indra
diff options
context:
space:
mode:
authorMerov Linden <merov@lindenlab.com>2015-02-04 07:49:44 -0800
committerMerov Linden <merov@lindenlab.com>2015-02-04 07:49:44 -0800
commit36d85815e7c009419777488b937b8d415209c89d (patch)
tree65b8c1cdad9e3454557969e3fdacba2ca241ec0b /indra
parentfe4f5f13da50bf833254b1d168de3b60d56f2bcb (diff)
DD-301 : Never filter the marketplace listings folder within the marketplace panels
Diffstat (limited to 'indra')
-rwxr-xr-xindra/newview/llinventorypanel.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/llinventorypanel.cpp b/indra/newview/llinventorypanel.cpp
index a2e5e1e5d8..19aa1bf6e7 100755
--- a/indra/newview/llinventorypanel.cpp
+++ b/indra/newview/llinventorypanel.cpp
@@ -291,8 +291,8 @@ void LLInventoryPanel::initFromParams(const LLInventoryPanel::Params& params)
getFilter().setFilterCategoryTypes(getFilter().getFilterCategoryTypes() & ~(1ULL << LLFolderType::FT_INBOX));
getFilter().setFilterCategoryTypes(getFilter().getFilterCategoryTypes() & ~(1ULL << LLFolderType::FT_OUTBOX));
}
- // hide marketplace listing box, unless we want to show it (note: hacky as show_root_folder is only used for marketplace...)
- if (!gSavedSettings.getBOOL("InventoryOutboxMakeVisible") && !mParams.show_root_folder)
+ // hide marketplace listing box, unless we are a marketplace panel
+ if (!gSavedSettings.getBOOL("InventoryOutboxMakeVisible") && !mParams.use_marketplace_folders)
{
getFilter().setFilterCategoryTypes(getFilter().getFilterCategoryTypes() & ~(1ULL << LLFolderType::FT_MARKETPLACE_LISTINGS));
}