diff options
| author | Dave SIMmONs <simon@lindenlab.com> | 2010-11-05 13:30:20 -0700 |
|---|---|---|
| committer | Dave SIMmONs <simon@lindenlab.com> | 2010-11-05 13:30:20 -0700 |
| commit | 447dc782fd4d490387fd98e9fb41135038512767 (patch) | |
| tree | b7875f5dd54d4068d777adbe90a3dd36b99a38eb /indra/newview/llgiveinventory.cpp | |
| parent | d5d4a065275d1db1093111222f29942ee171f81c (diff) | |
| parent | 124a59263184391b0b4ec418c532b7a715e9b5a3 (diff) | |
Merge latest from lindenlab/viewer-development
Diffstat (limited to 'indra/newview/llgiveinventory.cpp')
| -rw-r--r-- | indra/newview/llgiveinventory.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/llgiveinventory.cpp b/indra/newview/llgiveinventory.cpp index 260e15c714..f990b9294d 100644 --- a/indra/newview/llgiveinventory.cpp +++ b/indra/newview/llgiveinventory.cpp @@ -128,7 +128,7 @@ bool LLGiveInventory::isInventoryGiveAcceptable(const LLInventoryItem* item) switch(item->getType()) { case LLAssetType::AT_OBJECT: - if (gAgentAvatarp->isWearingAttachment(item->getUUID())) + if (get_is_item_worn(item->getUUID())) { acceptable = false; } @@ -139,7 +139,7 @@ bool LLGiveInventory::isInventoryGiveAcceptable(const LLInventoryItem* item) BOOL copyable = false; if (item->getPermissions().allowCopyBy(gAgentID)) copyable = true; - if (!copyable && gAgentWearables.isWearingItem(item->getUUID())) + if (!copyable && get_is_item_worn(item->getUUID())) { acceptable = false; } |