diff options
| author | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2012-06-28 14:24:37 -0400 |
|---|---|---|
| committer | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2012-06-28 14:24:37 -0400 |
| commit | d8b89bdb261ddd951b7ddb6354543a7714e3cf01 (patch) | |
| tree | 3206f333a3c690d1aa45f01a084915cc339945b5 /indra/newview/llvoavatarself.cpp | |
| parent | e4a0dda457039b1a04c74024d9fbcf02e071b13d (diff) | |
| parent | 14fef9f08a3bfb44d94771be6478a57ed9a91540 (diff) | |
merge
Diffstat (limited to 'indra/newview/llvoavatarself.cpp')
| -rwxr-xr-x | indra/newview/llvoavatarself.cpp | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/indra/newview/llvoavatarself.cpp b/indra/newview/llvoavatarself.cpp index 585a116acb..ecc616fa67 100755 --- a/indra/newview/llvoavatarself.cpp +++ b/indra/newview/llvoavatarself.cpp @@ -887,7 +887,10 @@ void LLVOAvatarSelf::removeMissingBakedTextures() invalidateComposite(mBakedTextureDatas[i].mTexLayerSet, FALSE); } updateMeshTextures(); - requestLayerSetUploads(); + if (!LLAppearanceMgr::instance().useServerTextureBaking()) + { + requestLayerSetUploads(); + } } } @@ -1630,7 +1633,7 @@ void LLVOAvatarSelf::invalidateComposite( LLTexLayerSet* layerset, BOOL upload_r layerset->requestUpdate(); layerset->invalidateMorphMasks(); - if( upload_result ) + if( upload_result && !LLAppearanceMgr::instance().useServerTextureBaking()) { llassert(isSelf()); |