livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Crashunting: Refine debug aid so it only spam logs if pointer is 0. Output U8 as S32 to get numbers instead of characters.

Nicky 2012-07-17 13:19:47 +02:00
parent 57b661bd8d
commit 70c8b89a2b
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
indra/newview/llviewerobject.cpp
View File

@ -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;
}

2
indra/newview/llvoavatar.cpp
View File

@ -9105,7 +9105,7 @@ BOOL LLVOAvatar::isTextureDefined(LLVOAvatarDefines::ETextureIndex te, U32 index
// <FS:ND> 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;
}
// </FS:ND>