diff options
| author | Mnikolenko Productengine <mnikolenko@productengine.com> | 2016-08-29 11:15:54 +0300 |
|---|---|---|
| committer | Mnikolenko Productengine <mnikolenko@productengine.com> | 2016-08-29 11:15:54 +0300 |
| commit | db230ec3ac9761600e83322fb890342de3e38981 (patch) | |
| tree | 87a39b48e1a92994f73e0bd61461ada8ef74cf14 /indra/newview/llinventorybridge.cpp | |
| parent | d6b0db5118788106087ec2e5743fd10110fdb470 (diff) | |
MAINT-1768 Previous changes are reverted. Sharing items from trash is disabled now.
Diffstat (limited to 'indra/newview/llinventorybridge.cpp')
| -rw-r--r-- | indra/newview/llinventorybridge.cpp | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/indra/newview/llinventorybridge.cpp b/indra/newview/llinventorybridge.cpp index 8d130c08e5..50fcf372a9 100644 --- a/indra/newview/llinventorybridge.cpp +++ b/indra/newview/llinventorybridge.cpp @@ -1398,6 +1398,12 @@ bool LLInvFVBridge::canShare() const // Categories can be given. can_share = (model->getCategory(mUUID) != NULL); } + + const LLUUID trash_id = gInventory.findCategoryUUIDForType(LLFolderType::FT_TRASH); + if ((mUUID == trash_id) || gInventory.isObjectDescendentOf(mUUID, trash_id)) + { + can_share = false; + } } } |