diff options
| author | AndreyL ProductEngine <andreylproductengine@lindenlab.com> | 2014-05-09 05:15:54 +0300 |
|---|---|---|
| committer | AndreyL ProductEngine <andreylproductengine@lindenlab.com> | 2014-05-09 05:15:54 +0300 |
| commit | bcf4e288731f79f2c61aaa958189083c1d89011d (patch) | |
| tree | 64cef7272123286ec616ee61f4947014943c4f80 | |
| parent | 06f5690100f8cd8aef01383adf0090a17ec4e515 (diff) | |
MAINT-3981 FIXED [SECURITY] Notecard being passed around that crashes any V3 based viewer when opened.
Correct fix after testing.
| -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); |