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

SL-11324 FIXED Accidental deletion of Marketplace Listings folder possible

meow-7.2.2
maxim_productengine 2019-05-31 18:10:50 +03:00
parent 1b793f5c10
commit 618446f8df
1 changed files with 1 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
indra/newview/llinventorybridge.cpp
View File

@ -2269,7 +2269,7 @@ public:
// Can be destroyed (or moved to trash)
BOOL LLFolderBridge::isItemRemovable() const
{
if (!get_is_category_removable(getInventoryModel(), mUUID))
if (!get_is_category_removable(getInventoryModel(), mUUID) || isMarketplaceListingsFolder())
{
return FALSE;
}
@ -2285,11 +2285,6 @@ BOOL LLFolderBridge::isItemRemovable() const
return FALSE;
}
}
if (isMarketplaceListingsFolder() && LLMarketplaceData::instance().getActivationState(mUUID))
{
return FALSE;
}
return TRUE;
}