From d68dcdcbed4e0c033374384839394b302a1e829e Mon Sep 17 00:00:00 2001
From: Ansariel <ansariel.hiller@phoenixviewer.com>
Date: Fri, 11 Dec 2020 22:27:48 +0100
Subject: [PATCH] FIRE-30583: Fix settings from marketplace folder being shown
 in quickprefs

---
 indra/newview/quickprefs.cpp | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/indra/newview/quickprefs.cpp b/indra/newview/quickprefs.cpp
index 81570ce6e7..b9d272ec4f 100644
--- a/indra/newview/quickprefs.cpp
+++ b/indra/newview/quickprefs.cpp
@@ -61,12 +61,17 @@
 class FSSettingsCollector : public LLInventoryCollectFunctor
 {
 public:
-	FSSettingsCollector() {}
+	FSSettingsCollector()
+	{
+		mMarketplaceFolderUUID = gInventory.findCategoryUUIDForType(LLFolderType::FT_MARKETPLACE_LISTINGS, false);
+	}
+
 	virtual ~FSSettingsCollector() {}
 
 	bool operator()(LLInventoryCategory* cat, LLInventoryItem* item)
 	{
 		if (item && item->getType() == LLAssetType::AT_SETTINGS &&
+			!gInventory.isObjectDescendentOf(item->getUUID(), mMarketplaceFolderUUID) &&
 			mSeen.find(item->getAssetUUID()) == mSeen.end())
 		{
 			mSeen.insert(item->getAssetUUID());
@@ -79,6 +84,7 @@ public:
 	}
 
 protected:
+	LLUUID mMarketplaceFolderUUID;
 	std::set<LLUUID> mSeen;
 };