diff options
| author | Oz Linden <oz@lindenlab.com> | 2011-04-14 15:09:03 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2011-04-14 15:09:03 -0400 |
| commit | 648d3e5b462b600d4f3af0c289c2e18e7730bf96 (patch) | |
| tree | ea1197864944c2ce6216f84aa4e0fb223b58d03f /indra/newview/lltooldraganddrop.cpp | |
| parent | fa785d9cf4638233586ecd6566a7d78dad51bb35 (diff) | |
| parent | 88a7262340f2fc5085f4ac6600790518d01292d6 (diff) | |
merge back additional 2.6.3 beta 2 fixes
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; } |