diff options
| author | Loren Shih <seraph@lindenlab.com> | 2011-04-20 11:26:12 -0400 |
|---|---|---|
| committer | Loren Shih <seraph@lindenlab.com> | 2011-04-20 11:26:12 -0400 |
| commit | b68d1a0f50c073257fb48692b666bb692d0c9981 (patch) | |
| tree | 46ca2d8a49a2fd8dc3d98db6da926faf84c31b8a /indra/newview/lltooldraganddrop.cpp | |
| parent | 6715603b6a991f822274b000e5d8fb9b8d405464 (diff) | |
| parent | da7cd9f8117757cd6acb0a5e93bc3c60443374f9 (diff) | |
Merge viewer-pre-beta -> seraph-viewer-pre-beta
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; } |