diff options
| author | Loren Shih <seraph@lindenlab.com> | 2010-04-05 16:16:13 -0400 |
|---|---|---|
| committer | Loren Shih <seraph@lindenlab.com> | 2010-04-05 16:16:13 -0400 |
| commit | b49165a9ddd18ef10d00cc00382295d94691078d (patch) | |
| tree | d017b0a499347b17fcf1f412adf2de5d5372e9ee /indra/newview/llinventoryfunctions.cpp | |
| parent | d13dac15505ca600caf7f780a11f9095661bc22f (diff) | |
EXT-6703 : LLInventory.h cleanup and create new LLInventoryDefines
Superficial header file cleanup for LLInventoryFunctions.
Change made to simulator files as well.
Diffstat (limited to 'indra/newview/llinventoryfunctions.cpp')
| -rw-r--r-- | indra/newview/llinventoryfunctions.cpp | 43 |
1 files changed, 21 insertions, 22 deletions
diff --git a/indra/newview/llinventoryfunctions.cpp b/indra/newview/llinventoryfunctions.cpp index ecb8f723e8..8487588404 100644 --- a/indra/newview/llinventoryfunctions.cpp +++ b/indra/newview/llinventoryfunctions.cpp @@ -102,30 +102,29 @@ bool LLInventoryCollectFunctor::itemTransferCommonlyAllowed(LLInventoryItem* ite switch(item->getType()) { - case LLAssetType::AT_CALLINGCARD: - // not allowed - break; - - case LLAssetType::AT_OBJECT: - if (isAgentAvatarValid() && !gAgentAvatarp->isWearingAttachment(item->getUUID())) - { - allowed = true; - } - break; - - case LLAssetType::AT_BODYPART: - case LLAssetType::AT_CLOTHING: - if(!gAgentWearables.isWearingItem(item->getUUID())) - { + case LLAssetType::AT_CALLINGCARD: + // not allowed + break; + + case LLAssetType::AT_OBJECT: + if (isAgentAvatarValid() && !gAgentAvatarp->isWearingAttachment(item->getUUID())) + { + allowed = true; + } + break; + + case LLAssetType::AT_BODYPART: + case LLAssetType::AT_CLOTHING: + if(!gAgentWearables.isWearingItem(item->getUUID())) + { + allowed = true; + } + break; + default: allowed = true; - } - break; - - default: - allowed = true; - break; + break; } - + return allowed; } |
