diff options
| author | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2016-03-22 16:19:10 -0400 |
|---|---|---|
| committer | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2016-03-22 16:19:10 -0400 |
| commit | 0879c48d832a69050e6fc6ac67b0d5f95b52e054 (patch) | |
| tree | c872ae80e13d12c3a282fd2af2c5005b0edb5e95 /indra/newview/llgiveinventory.cpp | |
| parent | cbbe82b8dc08260aa4102214a7c99aeab7915371 (diff) | |
| parent | 2afde26d93cc8773f5e84d187844f909347fc1bf (diff) | |
merge
Diffstat (limited to 'indra/newview/llgiveinventory.cpp')
| -rwxr-xr-x | indra/newview/llgiveinventory.cpp | 4 |
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; } } |