diff options
| author | Nicky <none@none> | 2012-07-19 22:54:17 +0200 |
|---|---|---|
| committer | Nicky <none@none> | 2012-07-19 22:54:17 +0200 |
| commit | 6fab95060fe2793e1206a5329f81877e3980f0cd (patch) | |
| tree | f5c8670a31a1ac2ede0bc792b3ba8d72ae2372f4 /indra/newview | |
| parent | bef60207e309db96d1aace39c24906903ed3bdc1 (diff) | |
Crashfix; Make sure getImage returns a valid result.
Diffstat (limited to 'indra/newview')
| -rwxr-xr-x | indra/newview/llvoavatar.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/indra/newview/llvoavatar.cpp b/indra/newview/llvoavatar.cpp index 366b6004be..2c1291c954 100755 --- a/indra/newview/llvoavatar.cpp +++ b/indra/newview/llvoavatar.cpp @@ -4421,7 +4421,9 @@ U32 LLVOAvatar::renderTransparent(BOOL first_pass) } // Can't test for baked hair being defined, since that won't always be the case (not all viewers send baked hair) // TODO: 1.25 will be able to switch this logic back to calling isTextureVisible(); - if (getImage(TEX_HAIR_BAKED, 0)->getID() != IMG_INVISIBLE || LLDrawPoolAlpha::sShowDebugAlpha) + + if ( getImage(TEX_HAIR_BAKED, 0) + && getImage(TEX_HAIR_BAKED, 0)->getID() != IMG_INVISIBLE || LLDrawPoolAlpha::sShowDebugAlpha) { num_indices += mMeshLOD[MESH_ID_HAIR]->render(mAdjustedPixelArea, first_pass, mIsDummy); first_pass = FALSE; |