From db230ec3ac9761600e83322fb890342de3e38981 Mon Sep 17 00:00:00 2001 From: Mnikolenko Productengine Date: Mon, 29 Aug 2016 11:15:54 +0300 Subject: MAINT-1768 Previous changes are reverted. Sharing items from trash is disabled now. --- indra/newview/llgiveinventory.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'indra/newview/llgiveinventory.cpp') 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; -- cgit v1.3