diff options
author | McCabe Maxsted | 2011-07-05 17:31:54 -0700 |
---|---|---|
committer | McCabe Maxsted | 2011-07-05 17:31:54 -0700 |
commit | 30519243fcb0a5119dc00983aafec65a17fd9158 (patch) | |
tree | 29bb822265fb119c2e68048da13d7464814fe600 /linden/indra | |
parent | Always add the version to the top of the log--makes debugging easier (diff) | |
download | meta-impy-30519243fcb0a5119dc00983aafec65a17fd9158.zip meta-impy-30519243fcb0a5119dc00983aafec65a17fd9158.tar.gz meta-impy-30519243fcb0a5119dc00983aafec65a17fd9158.tar.bz2 meta-impy-30519243fcb0a5119dc00983aafec65a17fd9158.tar.xz |
Don't crash if someone sends us a notecard they've managed to embed a calling card in
Diffstat (limited to 'linden/indra')
-rw-r--r-- | linden/indra/newview/llviewertexteditor.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/linden/indra/newview/llviewertexteditor.cpp b/linden/indra/newview/llviewertexteditor.cpp index 5d0656d..217770c 100644 --- a/linden/indra/newview/llviewertexteditor.cpp +++ b/linden/indra/newview/llviewertexteditor.cpp | |||
@@ -417,6 +417,7 @@ void LLEmbeddedItems::bindEmbeddedChars( const LLFontGL* font ) const | |||
417 | 417 | ||
418 | break; | 418 | break; |
419 | case LLAssetType::AT_SOUND: img_name = "inv_item_sound.tga"; break; | 419 | case LLAssetType::AT_SOUND: img_name = "inv_item_sound.tga"; break; |
420 | case LLAssetType::AT_CALLINGCARD: img_name = "inv_item_callingcard_offline.tga"; break; | ||
420 | case LLAssetType::AT_LANDMARK: | 421 | case LLAssetType::AT_LANDMARK: |
421 | if (item->getFlags() & LLInventoryItem::II_FLAGS_LANDMARK_VISITED) | 422 | if (item->getFlags() & LLInventoryItem::II_FLAGS_LANDMARK_VISITED) |
422 | { | 423 | { |
@@ -1384,6 +1385,7 @@ BOOL LLViewerTextEditor::openEmbeddedItem(LLInventoryItem* item, llwchar wc) | |||
1384 | case LLAssetType::AT_GESTURE: | 1385 | case LLAssetType::AT_GESTURE: |
1385 | showCopyToInvDialog( item, wc ); | 1386 | showCopyToInvDialog( item, wc ); |
1386 | return TRUE; | 1387 | return TRUE; |
1388 | case LLAssetType::AT_CALLINGCARD: | ||
1387 | default: | 1389 | default: |
1388 | return FALSE; | 1390 | return FALSE; |
1389 | } | 1391 | } |