diff options
| author | Merov Linden <merov@lindenlab.com> | 2014-05-19 21:43:42 -0700 |
|---|---|---|
| committer | Merov Linden <merov@lindenlab.com> | 2014-05-19 21:43:42 -0700 |
| commit | 51865f4e94885471dba0402b33f0b11b72bbdb30 (patch) | |
| tree | 3097df858573468d674ad5e4dee0e795cd498bc8 /indra/newview/llgiveinventory.cpp | |
| parent | 3eb53f5426a710b0403a84bd6849fe48553194eb (diff) | |
| parent | 644ca6a0f8a7759119814f88df93b8e838321a12 (diff) | |
Pull merge from lindenlab/viewer-release
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; } |