diff options
author | Dave SIMmONs <simon@lindenlab.com> | 2011-03-21 10:22:13 -0700 |
---|---|---|
committer | Dave SIMmONs <simon@lindenlab.com> | 2011-03-21 10:22:13 -0700 |
commit | 15404a3c5d50f5f106f5bc443d16e172c54e3e0f (patch) | |
tree | 2e25cb610683043143bf8b871e2ddec1021039d3 /indra/newview/llinventoryfunctions.cpp | |
parent | 07717a60dc3bce644dc08d7e8b2fa74715b9c7c0 (diff) | |
parent | be9bae601cfba3a94dfdcce4a6770cbb328681b6 (diff) |
Merge again
Diffstat (limited to 'indra/newview/llinventoryfunctions.cpp')
-rw-r--r-- | indra/newview/llinventoryfunctions.cpp | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/indra/newview/llinventoryfunctions.cpp b/indra/newview/llinventoryfunctions.cpp index 61d0a150b7..ba9bea02b9 100644 --- a/indra/newview/llinventoryfunctions.cpp +++ b/indra/newview/llinventoryfunctions.cpp @@ -483,9 +483,6 @@ bool LLInventoryCollectFunctor::itemTransferCommonlyAllowed(const LLInventoryIte switch(item->getType()) { - case LLAssetType::AT_CALLINGCARD: - return false; - break; case LLAssetType::AT_OBJECT: case LLAssetType::AT_BODYPART: case LLAssetType::AT_CLOTHING: |