diff options
| author | simon_linden <none@none> | 2013-10-14 14:58:27 -0700 |
|---|---|---|
| committer | simon_linden <none@none> | 2013-10-14 14:58:27 -0700 |
| commit | 9ccbf6bee8ec178087734bb25c220c0cfcbda052 (patch) | |
| tree | bbe24c8574d9f45235ca2c656f6ba0908d70bb73 /indra/newview/llvoavatarself.cpp | |
| parent | b0a873570e2d8df1241f9b44759da7f803fe3baf (diff) | |
MAINT-3308 : Crash in viewer with removeMissingBakedTextures() / updateMeshTextures() loop
Reviewed by Kelly
Diffstat (limited to 'indra/newview/llvoavatarself.cpp')
| -rwxr-xr-x | indra/newview/llvoavatarself.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/indra/newview/llvoavatarself.cpp b/indra/newview/llvoavatarself.cpp index 9ce99444d9..4e93c93fd2 100755 --- a/indra/newview/llvoavatarself.cpp +++ b/indra/newview/llvoavatarself.cpp @@ -847,7 +847,7 @@ void LLVOAvatarSelf::removeMissingBakedTextures() if (!tex || tex->isMissingAsset()) { LLViewerTexture *imagep = LLViewerTextureManager::getFetchedTexture(IMG_DEFAULT_AVATAR); - if (imagep) + if (imagep && imagep != tex) { setTEImage(te, imagep); removed = TRUE; @@ -863,13 +863,13 @@ void LLVOAvatarSelf::removeMissingBakedTextures() layerset->setUpdatesEnabled(TRUE); invalidateComposite(layerset, FALSE); } - updateMeshTextures(); + updateMeshTextures(); // may call back into this function if (getRegion() && !getRegion()->getCentralBakeVersion()) { - requestLayerSetUploads(); + requestLayerSetUploads(); + } } } -} //virtual void LLVOAvatarSelf::updateRegion(LLViewerRegion *regionp) |