diff options
| author | Merov Linden <merov@lindenlab.com> | 2010-11-04 18:10:29 -0700 |
|---|---|---|
| committer | Merov Linden <merov@lindenlab.com> | 2010-11-04 18:10:29 -0700 |
| commit | 4bbe823302427a705ea541d968f6058571a13c2f (patch) | |
| tree | d932a7a3483b674a7600b0e4bff3d0bda3344b35 /indra/newview/llinventoryfunctions.cpp | |
| parent | ba3307b8d0f2ceb40454174a6593f3f98ce98b65 (diff) | |
| parent | f7af29ab40c2405504969a453eba3919be1af5c5 (diff) | |
merge with STORM-105
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: |