diff options
| author | Merov Linden <merov@lindenlab.com> | 2010-11-04 14:30:32 -0700 |
|---|---|---|
| committer | Merov Linden <merov@lindenlab.com> | 2010-11-04 14:30:32 -0700 |
| commit | f7af29ab40c2405504969a453eba3919be1af5c5 (patch) | |
| tree | f31f6d31582e8ff89c769334cb70e1076c887ef7 /indra/newview/llgiveinventory.cpp | |
| parent | c2500f808cd8e1957054d5ec1b3555e30698c2b3 (diff) | |
| parent | 889aff8d87a4dbf3ca43c43bdeed825f67fd5e60 (diff) | |
merge with 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; } |