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/llgiveinventory.cpp | |
| parent | d6b0db5118788106087ec2e5743fd10110fdb470 (diff) | |
MAINT-1768 Previous changes are reverted. Sharing items from trash is disabled now.
Diffstat (limited to 'indra/newview/llgiveinventory.cpp')
| -rw-r--r-- | indra/newview/llgiveinventory.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/llgiveinventory.cpp b/indra/newview/llgiveinventory.cpp index 97cc7684e4..a9bf8a9a50 100644 --- a/indra/newview/llgiveinventory.cpp +++ b/indra/newview/llgiveinventory.cpp @@ -248,7 +248,7 @@ bool LLGiveInventory::doGiveInventoryCategory(const LLUUID& to_agent, gInventory.collectDescendentsIf (cat->getUUID(), cats, items, - LLInventoryModel::INCLUDE_TRASH, + LLInventoryModel::EXCLUDE_TRASH, giveable); S32 count = cats.size(); bool complete = true; @@ -499,7 +499,7 @@ bool LLGiveInventory::commitGiveInventoryCategory(const LLUUID& to_agent, gInventory.collectDescendentsIf (cat->getUUID(), cats, items, - LLInventoryModel::INCLUDE_TRASH, + LLInventoryModel::EXCLUDE_TRASH, giveable); bool give_successful = true; |