diff options
author | Loren Shih <seraph@lindenlab.com> | 2011-03-09 11:24:54 -0500 |
---|---|---|
committer | Loren Shih <seraph@lindenlab.com> | 2011-03-09 11:24:54 -0500 |
commit | c8293e29caf4701f130141a88b90709a09143d4e (patch) | |
tree | fc84848355f3c5d21e3fd6dd1ba2c5eade2d8c03 /indra/newview/llinventoryfunctions.cpp | |
parent | 94b0ce6d842a1f34bd46535a8b4db68aa397a541 (diff) | |
parent | 76a325b83271424d231561d8ef099df1406c9517 (diff) |
Automated merge up from viewer-development into mesh-development
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 342d15cf0f..db3b968730 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: |