diff options
| author | Dave Houlton <euclid@lindenlab.com> | 2020-02-21 23:22:40 +0000 |
|---|---|---|
| committer | Dave Houlton <euclid@lindenlab.com> | 2020-02-21 23:22:40 +0000 |
| commit | 7f1b4b22e69f2ad9c404b2e54a17c2ed4fa161da (patch) | |
| tree | b5ac7ac56e27105fcbf04d02aaebe31fdb6ce083 /indra/newview/llinventorybridge.cpp | |
| parent | 01d4fd2451f6ba2f4f17c7fbf0f9511d37b20e21 (diff) | |
| parent | 7674c00fb934b1269192553ccd0cd029d65a4e24 (diff) | |
Merge master (rel 6.3.8) to DRTVWR-440 (pull request #11)
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 a3a5d87fe0..4b051f3e44 100644 --- a/indra/newview/llinventorybridge.cpp +++ b/indra/newview/llinventorybridge.cpp @@ -2282,7 +2282,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; } @@ -2299,6 +2299,11 @@ BOOL LLFolderBridge::isItemRemovable() const } } + if (isMarketplaceListingsFolder() && (!LLMarketplaceData::instance().isSLMDataFetched() || LLMarketplaceData::instance().getActivationState(mUUID))) + { + return FALSE; + } + return TRUE; } |