diff options
| author | Oz Linden <oz@lindenlab.com> | 2011-01-24 11:44:43 -0500 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2011-01-24 11:44:43 -0500 |
| commit | f57aa3e83f1b4286b1d6b5cc8bca20fb924cb002 (patch) | |
| tree | 12dae11397876ce10d75eeabe5b1656ea18cd6ac /indra/newview/llgiveinventory.cpp | |
| parent | b429ff8ec3e1aebc60ff7f4d3376cfc8b9f2e669 (diff) | |
| parent | f9b9c7a5816cf0b9627a4a50e73a663667937145 (diff) | |
merge changes for i18n fixes
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; } |