From 30519243fcb0a5119dc00983aafec65a17fd9158 Mon Sep 17 00:00:00 2001
From: McCabe Maxsted
Date: Tue, 5 Jul 2011 17:31:54 -0700
Subject: Don't crash if someone sends us a notecard they've managed to embed a
 calling card in

---
 linden/indra/newview/llviewertexteditor.cpp | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'linden')

diff --git a/linden/indra/newview/llviewertexteditor.cpp b/linden/indra/newview/llviewertexteditor.cpp
index 5d0656d..217770c 100644
--- a/linden/indra/newview/llviewertexteditor.cpp
+++ b/linden/indra/newview/llviewertexteditor.cpp
@@ -417,6 +417,7 @@ void LLEmbeddedItems::bindEmbeddedChars( const LLFontGL* font ) const
 
 			break;
 		  case LLAssetType::AT_SOUND:			img_name = "inv_item_sound.tga";	break;
+		  case LLAssetType::AT_CALLINGCARD:		img_name = "inv_item_callingcard_offline.tga";   break;
 		  case LLAssetType::AT_LANDMARK:		
 			if (item->getFlags() & LLInventoryItem::II_FLAGS_LANDMARK_VISITED)
 			{
@@ -1384,6 +1385,7 @@ BOOL LLViewerTextEditor::openEmbeddedItem(LLInventoryItem* item, llwchar wc)
 	case LLAssetType::AT_GESTURE:
 		showCopyToInvDialog( item, wc );
 		return TRUE;
+	case LLAssetType::AT_CALLINGCARD:
 	default:
 		return FALSE;
 	}
-- 
cgit v1.1