summaryrefslogtreecommitdiff
path: root/indra
diff options
context:
space:
mode:
authorsimon <none@none>2014-05-09 11:10:33 -0700
committersimon <none@none>2014-05-09 11:10:33 -0700
commit06ac02fc2c548972e3024af24857c4daf8ffb3ff (patch)
treeda7acc0d0d1cc0d19c0db8d25ae61204bbf6aa26 /indra
parent250db74bf9325acdc1169f6c13d297e7fe44b753 (diff)
MAINT-3981 : Notecard passed around crashes viewer when opened
Diffstat (limited to 'indra')
-rwxr-xr-xindra/newview/llviewertexteditor.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llviewertexteditor.cpp b/indra/newview/llviewertexteditor.cpp
index 69f9bbdff8..a96cd4fe38 100755
--- a/indra/newview/llviewertexteditor.cpp
+++ b/indra/newview/llviewertexteditor.cpp
@@ -543,7 +543,7 @@ LLUIImagePtr LLEmbeddedItems::getItemImage(llwchar ext_char) const
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);
+ default: img_name = "Inv_Invalid"; break; // use the Inv_Invalid icon for undefined object types (see MAINT-3981)
}
return LLUI::getUIImage(img_name);