diff options
| author | Jonathan Yap <none@none> | 2011-03-19 16:29:32 -0400 |
|---|---|---|
| committer | Jonathan Yap <none@none> | 2011-03-19 16:29:32 -0400 |
| commit | fbd241da54ad6017825b59c5b0c71086d8b8957a (patch) | |
| tree | 34051dba97afece2416f25954080011d922d910e /indra/newview/llinventoryfunctions.cpp | |
| parent | 834d0f1ed612c8644e642103096daf7f0b0f44c9 (diff) | |
| parent | 1a7369408c0b2cd15dbdc79d045f3347a8ab47d1 (diff) | |
STORM-1019 Resolve merge conflicts
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: |