diff options
| author | Mnikolenko Productengine <mnikolenko@productengine.com> | 2016-06-22 17:53:47 +0300 |
|---|---|---|
| committer | Mnikolenko Productengine <mnikolenko@productengine.com> | 2016-06-22 17:53:47 +0300 |
| commit | a183385b2c475cf8096ad26b80f1a6a3dd7e0860 (patch) | |
| tree | ff660f042fbbf76582c1b91dfbdc317a0a745fdb | |
| parent | ba36b366dbdb2a0b228bc88c7e03cc93a65f48d4 (diff) | |
MAINT-1768 Allow sharing objects from trash folder
| -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 a9bf8a9a50..97cc7684e4 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::EXCLUDE_TRASH, + LLInventoryModel::INCLUDE_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::EXCLUDE_TRASH, + LLInventoryModel::INCLUDE_TRASH, giveable); bool give_successful = true; |