diff options
| author | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2014-05-19 18:10:45 -0400 |
|---|---|---|
| committer | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2014-05-19 18:10:45 -0400 |
| commit | 67051b26ba41a0d0cde2c2b96bccb0972d8ffe23 (patch) | |
| tree | 4856017a193dd7a559bb3021670877f2eab5d155 /indra/newview/llgiveinventory.cpp | |
| parent | a5bb8839fa24fa0b7da331f14eedccea1b44bc84 (diff) | |
| parent | 644ca6a0f8a7759119814f88df93b8e838321a12 (diff) | |
merge
Diffstat (limited to 'indra/newview/llgiveinventory.cpp')
| -rwxr-xr-x | indra/newview/llgiveinventory.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llgiveinventory.cpp b/indra/newview/llgiveinventory.cpp index 493dea62ff..813d2081ce 100755 --- a/indra/newview/llgiveinventory.cpp +++ b/indra/newview/llgiveinventory.cpp @@ -139,7 +139,7 @@ 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())) { acceptable = false; } |