summaryrefslogtreecommitdiff
path: root/indra/newview
diff options
context:
space:
mode:
authorSeth ProductEngine <slitovchuk@productengine.com>2011-03-30 23:42:13 +0300
committerSeth ProductEngine <slitovchuk@productengine.com>2011-03-30 23:42:13 +0300
commitdff83a1ba0592049ccdcd31177c183d62df65e85 (patch)
tree844892b1ca6f6c78c5f0db588843619c706dacb7 /indra/newview
parentf633aef1af5a1a695df655080d3a20c033a31e18 (diff)
STORM-1117 FIXED Disabled placing calling cards in prims inventory.
Diffstat (limited to 'indra/newview')
-rw-r--r--indra/newview/lltooldraganddrop.cpp4
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;
}