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

Backing out previous changeset since pulling it in annoyed some folks.

meow-7.2.2
Tonya Souther 2019-05-31 13:06:27 -05:00
parent d63376e420
commit 059e1c8cf5
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
indra/newview/llinventorybridge.cpp
View File

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