From d389f681b19c39fc633edebafbc745f00dce9416 Mon Sep 17 00:00:00 2001
From: "Brad Payne (Vir Linden)" <vir@lindenlab.com>
Date: Thu, 12 Jul 2018 18:10:19 +0100
Subject: MAINT-8863 - more diagnostics to pin down possible causes
---
indra/newview/llcontrolavatar.cpp | 2 ++
indra/newview/llskinningutil.cpp | 3 +++
indra/newview/lluiavatar.cpp | 2 ++
indra/newview/llvoavatar.cpp | 2 ++
indra/newview/llvoavatarself.cpp | 2 ++
5 files changed, 11 insertions(+)
(limited to 'indra/newview')
diff --git a/indra/newview/llcontrolavatar.cpp b/indra/newview/llcontrolavatar.cpp
index 93b178e0e9..6adb34c263 100644
--- a/indra/newview/llcontrolavatar.cpp
+++ b/indra/newview/llcontrolavatar.cpp
@@ -63,6 +63,8 @@ void LLControlAvatar::initInstance()
updateJointLODs();
updateGeometry(mDrawable);
hideSkirt();
+
+ mInitFlags |= 1<<4;
}
void LLControlAvatar::matchVolumeTransform()
diff --git a/indra/newview/llskinningutil.cpp b/indra/newview/llskinningutil.cpp
index 64794ae720..df8fc2f7ae 100644
--- a/indra/newview/llskinningutil.cpp
+++ b/indra/newview/llskinningutil.cpp
@@ -102,6 +102,7 @@ void LLSkinningUtil::initSkinningMatrixPalette(
// valid. In other cases of skinned rendering, invalid
// joints should already have been removed during scrubInvalidJoints().
LL_WARNS_ONCE("Avatar") << "Rigged to invalid joint name " << skin->mJointNames[j] << LL_ENDL;
+ LL_WARNS_ONCE() << "avatar build state: isBuilt() " << avatar->isBuilt() << " mInitFlags " << avatar->mInitFlags << LL_ENDL;
}
}
}
@@ -217,11 +218,13 @@ void LLSkinningUtil::initJointNums(LLMeshSkinInfo* skin, LLVOAvatar *avatar)
if (skin->mJointNums[j] < 0)
{
LL_WARNS_ONCE() << "joint has unusual number " << skin->mJointNames[j] << ": " << skin->mJointNums[j] << LL_ENDL;
+ LL_WARNS_ONCE() << "avatar build state: isBuilt() " << avatar->isBuilt() << " mInitFlags " << avatar->mInitFlags << LL_ENDL;
}
}
else
{
LL_WARNS_ONCE() << "unable to find joint " << skin->mJointNames[j] << LL_ENDL;
+ LL_WARNS_ONCE() << "avatar build state: isBuilt() " << avatar->isBuilt() << " mInitFlags " << avatar->mInitFlags << LL_ENDL;
}
}
}
diff --git a/indra/newview/lluiavatar.cpp b/indra/newview/lluiavatar.cpp
index 6cc14fc49b..e4e266c92a 100644
--- a/indra/newview/lluiavatar.cpp
+++ b/indra/newview/lluiavatar.cpp
@@ -56,4 +56,6 @@ void LLUIAvatar::initInstance()
slamPosition();
updateJointLODs();
updateGeometry(mDrawable);
+
+ mInitFlags |= 1<<3;
}
diff --git a/indra/newview/llvoavatar.cpp b/indra/newview/llvoavatar.cpp
index 1ed105f8d4..127dfe7c60 100644
--- a/indra/newview/llvoavatar.cpp
+++ b/indra/newview/llvoavatar.cpp
@@ -1188,6 +1188,8 @@ void LLVOAvatar::initInstance()
//VTPause(); // VTune
mVoiceVisualizer->setVoiceEnabled( LLVoiceClient::getInstance()->getVoiceEnabled( mID ) );
+
+ mInitFlags |= 1<<1;
}
// virtual
diff --git a/indra/newview/llvoavatarself.cpp b/indra/newview/llvoavatarself.cpp
index 31a76d6dd9..b3a2d7951c 100644
--- a/indra/newview/llvoavatarself.cpp
+++ b/indra/newview/llvoavatarself.cpp
@@ -235,6 +235,8 @@ void LLVOAvatarSelf::initInstance()
//doPeriodically(output_self_av_texture_diagnostics, 30.0);
doPeriodically(update_avatar_rez_metrics, 5.0);
doPeriodically(boost::bind(&LLVOAvatarSelf::checkStuckAppearance, this), 30.0);
+
+ mInitFlags |= 1<<2;
}
void LLVOAvatarSelf::setHoverIfRegionEnabled()
--
cgit v1.2.3