From 70c8b89a2b4750043541d75cab35764daca17738 Mon Sep 17 00:00:00 2001 From: Nicky Date: Tue, 17 Jul 2012 13:19:47 +0200 Subject: [PATCH] Crashunting: Refine debug aid so it only spam logs if pointer is 0. Output U8 as S32 to get numbers instead of characters. --- indra/newview/llviewerobject.cpp | 4 ++-- indra/newview/llvoavatar.cpp | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/indra/newview/llviewerobject.cpp b/indra/newview/llviewerobject.cpp index 78eb8ea37b..d43e1dbe18 100755 --- a/indra/newview/llviewerobject.cpp +++ b/indra/newview/llviewerobject.cpp @@ -4493,9 +4493,9 @@ LLViewerTexture *LLViewerObject::getTEImage(const U8 face) const if (face < getNumTEs()) { LLViewerTexture* image = mTEImages[face]; - if( !ndIsValidPtr( image ) ) + if( !ndIsValidPtr( image ) && image != 0 ) { - llwarns << "mTEImages[" << face << "] = " << (void*)image << llendl; + llwarns << "mTEImages[" << (S32)face << "] = " << (void*)image << llendl; return 0; } diff --git a/indra/newview/llvoavatar.cpp b/indra/newview/llvoavatar.cpp index a70057b38f..2e18d8e6cc 100644 --- a/indra/newview/llvoavatar.cpp +++ b/indra/newview/llvoavatar.cpp @@ -9105,7 +9105,7 @@ BOOL LLVOAvatar::isTextureDefined(LLVOAvatarDefines::ETextureIndex te, U32 index // getImage(te, index) can return 0 in some edge cases. if( !getImage( te, index ) || !ndIsValidPtr( getImage( te, index) ) ) { - llwarns << "getImage( " << te << ", " << index << " ) returned invalid ptr" << llendl; + llwarns << "getImage( " << (S32)te << ", " << index << " ) returned invalid ptr" << llendl; return FALSE; } //