diff options
| author | Wolfpup Lowenhar <wolfpup67@earthlink.net> | 2010-10-27 22:25:41 -0400 |
|---|---|---|
| committer | Wolfpup Lowenhar <wolfpup67@earthlink.net> | 2010-10-27 22:25:41 -0400 |
| commit | 9bd439e7c711de25ac65843c24575734f53f092f (patch) | |
| tree | c54b7b52d5e81222b5f6590041dee0cfe5246f89 /indra/newview/llgiveinventory.cpp | |
| parent | 379f9b824087a44f7ffab0becfafaa29611751be (diff) | |
| parent | 158e647247f67344a5d7a9dde6ccc80bad615c9a (diff) | |
STORM-255 : Merge from 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; } |