diff options
| author | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2013-03-11 07:37:03 -0400 |
|---|---|---|
| committer | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2013-03-11 07:37:03 -0400 |
| commit | e0ecc93e344a3a0223dfd141457141493af843a1 (patch) | |
| tree | 6f9651e8dfe9e733b2bbd918dbb73251e862b332 /indra | |
| parent | 5a436e46f6893719fc91a1cb70813671cb2a6d44 (diff) | |
| parent | 7e967ce2fd78078fb4284f2d61171bc90a669375 (diff) | |
merge
Diffstat (limited to 'indra')
| -rwxr-xr-x | indra/newview/llvoavatar.cpp | 2 | ||||
| -rwxr-xr-x | indra/newview/llvoavatarself.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/llvoavatar.cpp b/indra/newview/llvoavatar.cpp index 8cc3416d0e..139c297424 100755 --- a/indra/newview/llvoavatar.cpp +++ b/indra/newview/llvoavatar.cpp @@ -4342,7 +4342,7 @@ void LLVOAvatar::updateTextures() const EBakedTextureIndex baked_index = texture_dict->mBakedTextureIndex; if (texture_dict->mIsLocalTexture) { - addLocalTextureStats((ETextureIndex)texture_index, imagep, texel_area_ratio, render_avatar, layer_baked[baked_index]); + addLocalTextureStats((ETextureIndex)texture_index, imagep, texel_area_ratio, render_avatar, mBakedTextureDatas[baked_index].mIsUsed); } } } diff --git a/indra/newview/llvoavatarself.cpp b/indra/newview/llvoavatarself.cpp index 240ab202f8..64443f55af 100755 --- a/indra/newview/llvoavatarself.cpp +++ b/indra/newview/llvoavatarself.cpp @@ -2964,9 +2964,9 @@ void LLVOAvatarSelf::onCustomizeStart(bool disable_camera_switch) gAgentAvatarp->idleUpdateAppearanceAnimation(); #endif - gAgentAvatarp->updateTextures(); // call updateTextureStats gAgentAvatarp->invalidateAll(); // mark all bakes as dirty, request updates gAgentAvatarp->updateMeshTextures(); // make sure correct textures are applied to the avatar mesh. + gAgentAvatarp->updateTextures(); // call updateTextureStats } } |