diff options
| author | maxim_productengine <mnikolenko@productengine.com> | 2019-05-31 18:10:50 +0300 |
|---|---|---|
| committer | maxim_productengine <mnikolenko@productengine.com> | 2019-05-31 18:10:50 +0300 |
| commit | 618446f8df1b664f2ff826d106de5bd65ef09bac (patch) | |
| tree | 79956f94bbef9badaa8a4c350ead8000857f6034 /indra | |
| parent | 1b793f5c10e9f74d66ccbf0d085e169e61e1a592 (diff) | |
SL-11324 FIXED Accidental deletion of Marketplace Listings folder possible
Diffstat (limited to 'indra')
| -rw-r--r-- | indra/newview/llinventorybridge.cpp | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/indra/newview/llinventorybridge.cpp b/indra/newview/llinventorybridge.cpp index a50a66a8ce..64bc486767 100644 --- a/indra/newview/llinventorybridge.cpp +++ b/indra/newview/llinventorybridge.cpp @@ -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; } |