diff options
| author | Kent Quirk <q@lindenlab.com> | 2010-09-28 13:28:48 -0400 |
|---|---|---|
| committer | Kent Quirk <q@lindenlab.com> | 2010-09-28 13:28:48 -0400 |
| commit | ff46d7a2748d8e371cebdd44c14e1b34a8da8c92 (patch) | |
| tree | 16d2c03afc8255a892d34d01a22bb19f1e6bfe90 /indra/newview/llvoavatar.cpp | |
| parent | 53bfc13ab8732633d8a53c2d3602aff3e3e652d2 (diff) | |
| parent | d9547f5e8074f5997320815e8352c981022cb622 (diff) | |
Merge beta changes to viewer-dev.
Diffstat (limited to 'indra/newview/llvoavatar.cpp')
| -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) |