summaryrefslogtreecommitdiff
path: root/indra/newview
diff options
context:
space:
mode:
authorandreykproductengine <akleshchev@productengine.com>2016-01-12 20:53:56 +0200
committerandreykproductengine <akleshchev@productengine.com>2016-01-12 20:53:56 +0200
commit265aad01ab0b359cf869221ac36420080c32e7f0 (patch)
treedd68ea2c178f4cc216e30887e265d34b406fe5d8 /indra/newview
parent29f9e95de24e24fae27332f1f3623a27fba64634 (diff)
MAINT-4472 FIXED Tattoo Layers Behave as No Transfer Even With Transfer Enabled (No Mod No Copy)
Diffstat (limited to 'indra/newview')
-rwxr-xr-xindra/newview/llgiveinventory.cpp4
1 files changed, 3 insertions, 1 deletions
diff --git a/indra/newview/llgiveinventory.cpp b/indra/newview/llgiveinventory.cpp
index 813d2081ce..a9bf8a9a50 100755
--- a/indra/newview/llgiveinventory.cpp
+++ b/indra/newview/llgiveinventory.cpp
@@ -139,8 +139,10 @@ bool LLGiveInventory::isInventoryGiveAcceptable(const LLInventoryItem* item)
BOOL copyable = false;
if (item->getPermissions().allowCopyBy(gAgentID)) copyable = true;
- if (!copyable || get_is_item_worn(item->getUUID()))
+ if (!copyable && get_is_item_worn(item->getUUID()))
{
+ // worn no-copy items can't be transfered,
+ // but it is valid to transfer a copy of a worn item
acceptable = false;
}
}