From 7e967ce2fd78078fb4284f2d61171bc90a669375 Mon Sep 17 00:00:00 2001
From: Nyx Linden <nyx@lindenlab.com>
Date: Fri, 8 Mar 2013 18:45:33 -0500
Subject: SH-3941 SH-3954 FIX local appearance does not update properly
We were using an indicator of whether there *was* a baked texture to whether we
were *using* a baked texture. Switched to one of the (several) proper indicators
of whether a baked texture was in use. This should allow local texture data to
get marked for download when we enter appearance mode.
Local testing confirms that old apperances linger for a second or two, but are
soon replaced by the correct local renders.
---
indra/newview/llvoavatar.cpp | 2 +-
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 cec1dc677f..5bc45b3551 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 f7902c5302..36229e51ec 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
}
}
--
cgit v1.2.3