diff options
| author | Oz Linden <oz@lindenlab.com> | 2011-04-10 22:41:34 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2011-04-10 22:41:34 -0400 |
| commit | fe99404803c0582f845d0d42c0908b96cd6682fb (patch) | |
| tree | 670291989177f3b408c376f01ab70859751fca04 /indra/newview/lltooldraganddrop.cpp | |
| parent | a84c8e0704e363a9b24f3ee56760178267086793 (diff) | |
| parent | 0c05c8c89632d2747ca8b364ff663d1d5505fb4d (diff) | |
merge changes for storm-1118
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; } |