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

MAINT-8239 - more logging and better notes about the fix

master
Brad Payne (Vir Linden) 2018-02-12 16:47:39 +00:00
parent dce015ddb0
commit dec077e54a
2 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
indra/newview/llvoavatar.cpp
View File

@ -5902,6 +5902,7 @@ void LLVOAvatar::addAttachmentOverridesForObject(LLViewerObject *vo)
if (vobj->isMesh() &&
((vobj->getVolume() && !vobj->getVolume()->isMeshAssetLoaded()) || !gMeshRepo.meshRezEnabled()))
{
LL_DEBUGS("AnimatedObjects") << "failed to add attachment overrides for root object " << root_object->getID() << " mesh asset not loaded" << LL_ENDL;
return;
}
const LLMeshSkinInfo* pSkinData = vobj->getSkinInfo();
@ -5968,6 +5969,10 @@ void LLVOAvatar::addAttachmentOverridesForObject(LLViewerObject *vo)
}
}
}
else
{
LL_DEBUGS("AnimatedObjects") << "failed to add attachment overrides for root object " << root_object->getID() << " not mesh or no pSkinData" << LL_ENDL;
}
//Rebuild body data if we altered joints/pelvis
if ( pelvisGotSet )

11
indra/newview/llvovolume.cpp
View File

@ -3474,9 +3474,16 @@ void LLVOVolume::afterReparent()
if (isAnimatedObject() && getControlAvatar())
{
LL_DEBUGS("AnimatedObjects") << "adding attachment overrides, parent is animated object"
LL_DEBUGS("AnimatedObjects") << "adding attachment overrides, parent is animated object "
<< ((LLViewerObject*)getParent())->getID() << LL_ENDL;
//getControlAvatar()->addAttachmentOverridesForObject(this);
// MAINT-8239 - doing a full rebuild whenever parent is set
// makes the joint overrides load more robustly. In theory,
// addAttachmentOverrides should be sufficient, but in
// practice doing a full rebuild helps compensate for
// notifyMeshLoaded() not being called reliably enough.
// was: getControlAvatar()->addAttachmentOverridesForObject(this);
getControlAvatar()->rebuildAttachmentOverrides();
getControlAvatar()->updateAnimations();
}