diff options
| author | prep <prep@lindenlab.com> | 2010-10-28 13:54:43 -0400 |
|---|---|---|
| committer | prep <prep@lindenlab.com> | 2010-10-28 13:54:43 -0400 |
| commit | a91bff4036bbdd0f32722ed573f9f44ab00f00f0 (patch) | |
| tree | a2ee17189b530ace49c886d8a8acc4deb32620b5 /indra/newview/llinventoryfunctions.cpp | |
| parent | 53d5fd1e9bb59868b793f9bef0529cd62ca70126 (diff) | |
| parent | 32bcdd11990e1fa5126a15a2bd22249162c0806a (diff) | |
merge
Diffstat (limited to 'indra/newview/llinventoryfunctions.cpp')
| -rw-r--r-- | indra/newview/llinventoryfunctions.cpp | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/indra/newview/llinventoryfunctions.cpp b/indra/newview/llinventoryfunctions.cpp index 07470bf883..1b07aa279b 100644 --- a/indra/newview/llinventoryfunctions.cpp +++ b/indra/newview/llinventoryfunctions.cpp @@ -487,12 +487,9 @@ bool LLInventoryCollectFunctor::itemTransferCommonlyAllowed(const LLInventoryIte return false; break; case LLAssetType::AT_OBJECT: - if (isAgentAvatarValid() && !gAgentAvatarp->isWearingAttachment(item->getUUID())) - return true; - break; case LLAssetType::AT_BODYPART: case LLAssetType::AT_CLOTHING: - if(!gAgentWearables.isWearingItem(item->getUUID())) + if (!get_is_item_worn(item->getUUID())) return true; break; default: |