livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

correct merge error in llvoavatar

master
Oz Linden 2010-12-15 08:58:15 -05:00
parent ad99134668
commit 9ea172a8e2
1 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
indra/newview/llvoavatar.cpp
View File

@ -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);