summaryrefslogtreecommitdiff
path: root/indra/newview/llinventoryfunctions.cpp
diff options
context:
space:
mode:
authorOz Linden <oz@lindenlab.com>2011-03-18 19:56:37 -0400
committerOz Linden <oz@lindenlab.com>2011-03-18 19:56:37 -0400
commit85ccab2d8178c508e585f987bb076951bf2e9ddb (patch)
tree5fbdf54372657c2c9353d274cd81f62b1e4fdf02 /indra/newview/llinventoryfunctions.cpp
parent9f2a04f217d54344360edc554456d9804e17eeb7 (diff)
parent6ef593580239df7b967cca59d4cfa9fcd8db6aec (diff)
Automated merge with file:///Users/oz/Work/viewer-vs2010
Diffstat (limited to 'indra/newview/llinventoryfunctions.cpp')
-rw-r--r--indra/newview/llinventoryfunctions.cpp3
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: