diff options
| author | Oz Linden <oz@lindenlab.com> | 2010-12-15 08:58:15 -0500 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2010-12-15 08:58:15 -0500 |
| commit | 9ea172a8e21913b115e676a022e80e784dfd5142 (patch) | |
| tree | e4f58a1205bbd306f863cfedb2b96181eac23bc7 /indra | |
| parent | ad991346683c9e69d3e86b0e98275cb3fa47fb72 (diff) | |
correct merge error in llvoavatar
Diffstat (limited to 'indra')
| -rw-r--r-- | indra/newview/llvoavatar.cpp | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/indra/newview/llvoavatar.cpp b/indra/newview/llvoavatar.cpp index f86c4321c4..49d4da71ff 100644 --- a/indra/newview/llvoavatar.cpp +++ b/indra/newview/llvoavatar.cpp @@ -6249,8 +6249,7 @@ void LLVOAvatar::updateMeshTextures() || !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); |