diff options
| author | Nyx (Neal Orman) <nyx@lindenlab.com> | 2010-09-22 18:10:47 -0400 |
|---|---|---|
| committer | Nyx (Neal Orman) <nyx@lindenlab.com> | 2010-09-22 18:10:47 -0400 |
| commit | aa7c49759fcd3075550167fa3a1e10c8045fe9d4 (patch) | |
| tree | 66f58c665e630b16e24ca71413e85ebd51886e84 | |
| parent | a5fc11ea21ad8ac9bf6a4be97c16fe977db40175 (diff) | |
| parent | c395be02b1e8ca6a5d2fed241563bf2fbbc4f3ef (diff) | |
Automated merge with ssh://hg.lindenlab.com/davep/viewer-mesh/
| -rwxr-xr-x | 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 a6b3c436f4..54400c184b 100755 --- a/indra/newview/llvoavatar.cpp +++ b/indra/newview/llvoavatar.cpp @@ -6189,9 +6189,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) |