diff options
| author | Nyx (Neal Orman) <nyx@lindenlab.com> | 2010-09-22 18:09:17 -0400 |
|---|---|---|
| committer | Nyx (Neal Orman) <nyx@lindenlab.com> | 2010-09-22 18:09:17 -0400 |
| commit | e8d1ddb22545fa2abc0400d7af64e82c79fffa95 (patch) | |
| tree | 3b3a606061c5ca5099ea782971aa301b9a3f364b /indra | |
| parent | 02a4c4ac0d36318adc8dd6e7f0c46d236b9f39c6 (diff) | |
SH-188 FIX crash in llvoavatar.cpp
We were using a NULL pointer after checking it. Did some logic juggling to
ensure that we only use the pointer if it is non-null
Code reviewed by Seraph
(transplanted from a90fe10ddac9545249c6f218af438a36bcbc3162)
Diffstat (limited to 'indra')
| -rw-r--r-- | indra/newview/llvoavatar.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/indra/newview/llvoavatar.cpp b/indra/newview/llvoavatar.cpp index 46d8f65d23..c31714de5a 100644 --- a/indra/newview/llvoavatar.cpp +++ b/indra/newview/llvoavatar.cpp @@ -6089,9 +6089,9 @@ void LLVOAvatar::updateMeshTextures() // use the last-known good baked texture until it finish the first // render of the new layerset. - const BOOL layerset_invalid = !mBakedTextureDatas[i].mTexLayerSet - || !mBakedTextureDatas[i].mTexLayerSet->getComposite()->isInitialized() - || !mBakedTextureDatas[i].mTexLayerSet->isLocalTextureDataAvailable(); + const BOOL layerset_invalid = mBakedTextureDatas[i].mTexLayerSet + && ( !mBakedTextureDatas[i].mTexLayerSet->getComposite()->isInitialized() + || !mBakedTextureDatas[i].mTexLayerSet->isLocalTextureDataAvailable() ); use_lkg_baked_layer[i] = (!is_layer_baked[i] && (mBakedTextureDatas[i].mLastTextureIndex != IMG_DEFAULT_AVATAR) |