livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

FIRE-30583: Fix settings from marketplace folder being shown in quickprefs

meow-7.2.2
Ansariel 2020-12-11 22:27:48 +01:00
parent 84d25e8098
commit d68dcdcbed
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
indra/newview/quickprefs.cpp
View File

@ -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;
};