diff options
author | Don Kjer <don@lindenlab.com> | 2011-04-14 18:27:31 +0000 |
---|---|---|
committer | Don Kjer <don@lindenlab.com> | 2011-04-14 18:27:31 +0000 |
commit | 01f4570c795b197e74bfa96139631c43df8d0664 (patch) | |
tree | 7c1952cc51adec21025f537281e59f828e75224d /indra/newview/lltooldraganddrop.cpp | |
parent | 2bf967149626672584b17b53fb5d2e6186f3d896 (diff) | |
parent | 88a7262340f2fc5085f4ac6600790518d01292d6 (diff) |
Merge with viewer-development
Diffstat (limited to 'indra/newview/lltooldraganddrop.cpp')
-rw-r--r-- | indra/newview/lltooldraganddrop.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/indra/newview/lltooldraganddrop.cpp b/indra/newview/lltooldraganddrop.cpp index 1c745906aa..ba243f258a 100644 --- a/indra/newview/lltooldraganddrop.cpp +++ b/indra/newview/lltooldraganddrop.cpp @@ -1386,6 +1386,10 @@ EAcceptance LLToolDragAndDrop::willObjectAcceptInventory(LLViewerObject* obj, LL worn = TRUE; } break; + case LLAssetType::AT_CALLINGCARD: + // Calling Cards in object are disabled for now + // because of incomplete LSL support. See STORM-1117. + return ACCEPT_NO; default: break; } |