diff options
| author | brad kittenbrink <brad@lindenlab.com> | 2010-11-02 19:02:49 -0700 |
|---|---|---|
| committer | brad kittenbrink <brad@lindenlab.com> | 2010-11-02 19:02:49 -0700 |
| commit | 6a9e70053beaa0fb936482f5594137a8bcdf2f1e (patch) | |
| tree | 9f6a44825ed0886807c4b38d9a92188261bbaf25 /indra/newview/llinventoryfunctions.cpp | |
| parent | 4902a2752e6ee5dfd47be3d94955f88bf73bf5d8 (diff) | |
| parent | accbddaeadeec7221c9244bf1c0245b8ccbd12bc (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 f3d9639dee..ef20869114 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: |