diff options
| author | simon <none@none> | 2014-05-09 11:16:59 -0700 |
|---|---|---|
| committer | simon <none@none> | 2014-05-09 11:16:59 -0700 |
| commit | 4fa7ae949200928cfac51e045fecf2178a649b7b (patch) | |
| tree | 6c09ead0f8b4debece9e85aaf5936d62f6715718 /indra/newview | |
| parent | dc4c184696b308b8f60fa1dd751b35e22bd47d62 (diff) | |
| parent | 2615c62b13869f690b8c48bbf3dc65b3588b255a (diff) | |
Merge downstream code
Diffstat (limited to 'indra/newview')
| -rwxr-xr-x | indra/newview/llviewertexteditor.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/llviewertexteditor.cpp b/indra/newview/llviewertexteditor.cpp index 69f9bbdff8..0c4f55d704 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); |