From 403d569adc676e3a0af96175c77e07d0631f9aae Mon Sep 17 00:00:00 2001
From: AndreyL ProductEngine <andreylproductengine@lindenlab.com>
Date: Fri, 9 May 2014 05:15:54 +0300
Subject: [PATCH] MAINT-3981 FIXED [SECURITY] Notecard being passed around that
 crashes any V3 based viewer when opened. Correct fix after testing.

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

diff --git a/indra/newview/llviewertexteditor.cpp b/indra/newview/llviewertexteditor.cpp
index 69f9bbdff85..0c4f55d7042 100755
--- a/indra/newview/llviewertexteditor.cpp
+++ b/indra/newview/llviewertexteditor.cpp
@@ -542,8 +542,8 @@ LLUIImagePtr LLEmbeddedItems::getItemImage(llwchar ext_char) const
 			case LLAssetType::AT_BODYPART:		img_name = "Inv_Skin";		break;
 			case LLAssetType::AT_ANIMATION:		img_name = "Inv_Animation";	break;
 			case LLAssetType::AT_GESTURE:		img_name = "Inv_Gesture";	break;
-			case LLAssetType::AT_MESH:          img_name = "Inv_Mesh";	    break;
-			default: llassert(0);
+			case LLAssetType::AT_MESH:      	img_name = "Inv_Mesh";	    break;
+			default:                        	img_name = "Inv_Invalid";   break; // use the Inv_Invalid icon for undefined object types (see MAINT-3981)
 		}
 
 		return LLUI::getUIImage(img_name);
-- 
GitLab