diff options
| author | dolphin <dolphin@lindenlab.com> | 2014-05-20 10:03:09 -0700 |
|---|---|---|
| committer | dolphin <dolphin@lindenlab.com> | 2014-05-20 10:03:09 -0700 |
| commit | 0481494c2df074d2b548d6b80e595a208a2848c3 (patch) | |
| tree | f3554fc49b549a4ae2b9d1e9a5f157e478ee38df /indra/newview/llviewertexteditor.cpp | |
| parent | 4c7b0cb528f61bc20866c2f7c43049ef7bc49bf2 (diff) | |
| parent | 644ca6a0f8a7759119814f88df93b8e838321a12 (diff) | |
Merge with 3.7.8-release
Diffstat (limited to 'indra/newview/llviewertexteditor.cpp')
| -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); |