livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

MAINT-8863 - more diagnostics to pin down possible causes

meow-7.2.2
Brad Payne (Vir Linden) 2018-07-12 18:10:19 +01:00
parent a45868cd03
commit d389f681b1
7 changed files with 16 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
indra/llappearance/llavatarappearance.cpp
View File

@ -190,7 +190,8 @@ LLAvatarAppearance::LLAvatarAppearance(LLWearableData* wearable_data) :
mNumBones(0),
mNumCollisionVolumes(0),
mCollisionVolumes(NULL),
mIsBuilt(FALSE)
mIsBuilt(FALSE),
mInitFlags(0)
{
llassert_always(mWearableData);
mBakedTextureDatas.resize(LLAvatarAppearanceDefines::BAKED_NUM_INDICES);
@ -281,6 +282,8 @@ void LLAvatarAppearance::initInstance()
buildCharacter();
mInitFlags |= 1<<0;
}
// virtual

1
indra/llappearance/llavatarappearance.h
View File

@ -70,6 +70,7 @@ public:
static void initClass();
static void cleanupClass(); // Cleanup data that's only init'd once per class.
virtual void initInstance(); // Called after construction to initialize the instance.
S32 mInitFlags;
virtual BOOL loadSkeletonNode();
BOOL loadMeshNodes();
BOOL loadLayersets();

2
indra/newview/llcontrolavatar.cpp
View File

@ -63,6 +63,8 @@ void LLControlAvatar::initInstance()
updateJointLODs();
updateGeometry(mDrawable);
hideSkirt();
mInitFlags |= 1<<4;
}
void LLControlAvatar::matchVolumeTransform()

3
indra/newview/llskinningutil.cpp
View File

@ -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;
}
}
}

2
indra/newview/lluiavatar.cpp
View File

@ -56,4 +56,6 @@ void LLUIAvatar::initInstance()
slamPosition();
updateJointLODs();
updateGeometry(mDrawable);
mInitFlags |= 1<<3;
}

2
indra/newview/llvoavatar.cpp
View File

@ -1188,6 +1188,8 @@ void LLVOAvatar::initInstance()
//VTPause(); // VTune
mVoiceVisualizer->setVoiceEnabled( LLVoiceClient::getInstance()->getVoiceEnabled( mID ) );
mInitFlags |= 1<<1;
}
// virtual

2
indra/newview/llvoavatarself.cpp
View File

@ -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()