summaryrefslogtreecommitdiff
path: root/indra/newview/llgiveinventory.cpp
diff options
context:
space:
mode:
authorOz Linden <oz@lindenlab.com>2010-11-08 16:47:46 -0500
committerOz Linden <oz@lindenlab.com>2010-11-08 16:47:46 -0500
commitb657516f72f016a918e0ff627105dd380a94394c (patch)
tree7d30ace2d3cba42c5f7de1c3dd23748e31b2803f /indra/newview/llgiveinventory.cpp
parent451d115c1009ded2b2d74efefbe0611c62343eed (diff)
parentc446062bd3bd3f172b20f22f2086cea962fb7278 (diff)
pull beta changes back to development
Diffstat (limited to 'indra/newview/llgiveinventory.cpp')
-rw-r--r--indra/newview/llgiveinventory.cpp4
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;
}