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/llinventoryfunctions.cpp | |
| parent | 379f9b824087a44f7ffab0becfafaa29611751be (diff) | |
| parent | 158e647247f67344a5d7a9dde6ccc80bad615c9a (diff) | |
STORM-255 : Merge from viewer-development
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: |