summaryrefslogtreecommitdiff
path: root/indra/newview/llinventoryfunctions.cpp
diff options
context:
space:
mode:
authorOz Linden <oz@lindenlab.com>2011-03-17 14:56:01 -0400
committerOz Linden <oz@lindenlab.com>2011-03-17 14:56:01 -0400
commitf64a20ddcff91677b02b7688e08819cffb0989c9 (patch)
tree707b1430e5b7ef2e27f4f34c66822e92dfffd294 /indra/newview/llinventoryfunctions.cpp
parentc077250ff16aeaf0ec4c036154a427c677e85eb3 (diff)
parent17d87b0fa5bdd8d15dbcd98e65c30ebf4e5b94ec (diff)
merge changes for storm-1016
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: