For EXT-5333: Bodyparts missing from appearance and COF. Fixed invisible to self after first login via createStandardWearables(). (Patch from Nyx)

2 files changed, 17 insertions, 2 deletions

diff --git a/indra/newview/llvoavatar.cpp b/indra/newview/llvoavatar.cpp
index 72b9c6df98..9c3ef2672f 100644
--- a/indra/newview/llvoavatar.cpp
+++ b/indra/newview/llvoavatar.cpp
@@ -2121,6 +2121,10 @@ static LLFastTimer::DeclareTimer FTM_JOINT_UPDATE("Update Joints");
 //------------------------------------------------------------------------
 BOOL LLVOAvatar::idleUpdate(LLAgent &agent, LLWorld &world, const F64 &time)
 {
+	if (isSelf())
+	{
+		llinfos << "self idle update" << llendl;
+	}
 	LLMemType mt(LLMemType::MTYPE_AVATAR);
 	LLFastTimer t(FTM_AVATAR_UPDATE);
 
@@ -2535,6 +2539,10 @@ void LLVOAvatar::idleUpdateLipSync(bool voice_enabled)
 
 void LLVOAvatar::idleUpdateLoadingEffect()
 {
+	if (isSelf())
+	{
+		llinfos << "self idle update loading effect" << llendl;
+	}
 	// update visibility when avatar is partially loaded
 	if (updateIsFullyLoaded()) // changed?
 	{
@@ -5883,6 +5891,10 @@ void LLVOAvatar::updateRuthTimer(bool loading)
 
 BOOL LLVOAvatar::processFullyLoadedChange(bool loading)
 {
+	if (isSelf())
+	{
+		llinfos << "isSelf, loading " << loading << llendl;
+	}
 	// we wait a little bit before giving the all clear,
 	// to let textures settle down
 	const F32 PAUSE = 1.f;
diff --git a/indra/newview/llvoavatarself.cpp b/indra/newview/llvoavatarself.cpp
index 00998b300a..a93cf780b8 100644
--- a/indra/newview/llvoavatarself.cpp
+++ b/indra/newview/llvoavatarself.cpp
@@ -1653,8 +1653,11 @@ BOOL LLVOAvatarSelf::updateIsFullyLoaded()
 {
 	BOOL loading = FALSE;
 
-	// do we have a shape?
-	if (visualParamWeightsAreDefault())
+	// do we have our body parts?
+	if (gAgentWearables.getWearableCount(WT_SHAPE) == 0 ||
+		gAgentWearables.getWearableCount(WT_HAIR) == 0 ||
+		gAgentWearables.getWearableCount(WT_EYES) == 0 ||
+		gAgentWearables.getWearableCount(WT_SKIN) == 0)	
 	{
 		loading = TRUE;
 	}