From dff83a1ba0592049ccdcd31177c183d62df65e85 Mon Sep 17 00:00:00 2001
From: Seth ProductEngine <slitovchuk@productengine.com>
Date: Wed, 30 Mar 2011 23:42:13 +0300
Subject: STORM-1117 FIXED Disabled placing calling cards in prims inventory.

---
 indra/newview/lltooldraganddrop.cpp | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'indra/newview/lltooldraganddrop.cpp')

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;
 	}
-- 
cgit v1.2.3