diff options
| author | Andrey Lihatskiy <alihatskiy@productengine.com> | 2020-02-22 18:45:06 +0200 |
|---|---|---|
| committer | Andrey Lihatskiy <alihatskiy@productengine.com> | 2020-02-22 18:45:06 +0200 |
| commit | 6b283f166b0578172962b05145d928a73a322926 (patch) | |
| tree | 90c4980cd8b7444e777b5768add11be302bdf3e2 /indra/newview/llinventorybridge.cpp | |
| parent | 95992bd1a2c14fd88b18c73a068989bd4235bd55 (diff) | |
| parent | 2c4133c8db131b08d40fc91e2881b873ea1a984d (diff) | |
Merge branch 'master' into DRTVWR-460
Diffstat (limited to 'indra/newview/llinventorybridge.cpp')
| -rw-r--r-- | indra/newview/llinventorybridge.cpp | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/indra/newview/llinventorybridge.cpp b/indra/newview/llinventorybridge.cpp index 6d2d533c9d..36784ce3f9 100644 --- a/indra/newview/llinventorybridge.cpp +++ b/indra/newview/llinventorybridge.cpp @@ -2270,7 +2270,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; } @@ -2287,6 +2287,11 @@ BOOL LLFolderBridge::isItemRemovable() const } } + if (isMarketplaceListingsFolder() && (!LLMarketplaceData::instance().isSLMDataFetched() || LLMarketplaceData::instance().getActivationState(mUUID))) + { + return FALSE; + } + return TRUE; } |