diff options
| author | Nyx (Neal Orman) <nyx@lindenlab.com> | 2010-08-18 10:46:47 -0400 |
|---|---|---|
| committer | Nyx (Neal Orman) <nyx@lindenlab.com> | 2010-08-18 10:46:47 -0400 |
| commit | 7a0bf546f7f8efd38665991d7c668aee8b10f722 (patch) | |
| tree | 34628b3c486100df281efe140aed1af697156d35 | |
| parent | a0c64642c28f5136c7b5c33afb3fa860ab4f6ed4 (diff) | |
| parent | 1435a9cff9e7eca67605890ce85a359099964df5 (diff) | |
Automated merge with ssh://nyx@hg.lindenlab.com/q/viewer-release/
| -rw-r--r-- | indra/newview/lltexlayer.cpp | 4 | ||||
| -rw-r--r-- | indra/newview/llvoavatar.cpp | 8 |
2 files changed, 10 insertions, 2 deletions
diff --git a/indra/newview/lltexlayer.cpp b/indra/newview/lltexlayer.cpp index 1feb987682..d8b9bc2329 100644 --- a/indra/newview/lltexlayer.cpp +++ b/indra/newview/lltexlayer.cpp @@ -581,6 +581,10 @@ void LLTexLayerSetBuffer::doUpdate() } restartUpdateTimer(); + + // need to swtich to using this layerset if this is the first update + // after getting the lowest LOD + mTexLayerSet->getAvatar()->updateMeshTextures(); // Print out notification that we uploaded this texture. if (gSavedSettings.getBOOL("DebugAvatarRezTime")) diff --git a/indra/newview/llvoavatar.cpp b/indra/newview/llvoavatar.cpp index 4e00355bbe..c688338000 100644 --- a/indra/newview/llvoavatar.cpp +++ b/indra/newview/llvoavatar.cpp @@ -6251,10 +6251,14 @@ void LLVOAvatar::updateMeshTextures() // When an avatar is changing clothes and not in Appearance mode, // 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(); + use_lkg_baked_layer[i] = (!is_layer_baked[i] && (mBakedTextureDatas[i].mLastTextureIndex != IMG_DEFAULT_AVATAR) - && mBakedTextureDatas[i].mTexLayerSet - && !mBakedTextureDatas[i].mTexLayerSet->getComposite()->isInitialized()); + && layerset_invalid); if (use_lkg_baked_layer[i]) { mBakedTextureDatas[i].mTexLayerSet->setUpdatesEnabled(TRUE); |