diff options
| author | Debi King (Dessie) <dessie@lindenlab.com> | 2011-04-18 10:07:40 -0400 |
|---|---|---|
| committer | Debi King (Dessie) <dessie@lindenlab.com> | 2011-04-18 10:07:40 -0400 |
| commit | da7cd9f8117757cd6acb0a5e93bc3c60443374f9 (patch) | |
| tree | 3916874ed180ee9567b4fb76d88d8ce72689c257 /indra/newview/lltooldraganddrop.cpp | |
| parent | d534c8009f2573400a21c19b00691536fc3cc23f (diff) | |
| parent | b8069d1c250c03e9fffda0a9264bfd04a12f8292 (diff) | |
merged from 2.6.4-start tag in 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; } |