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

MAINT-8863 - more diagnostics and possible fix

master
Brad Payne (Vir Linden) 2018-07-13 18:56:08 +01:00
parent 3b8b002953
commit 73c76fdccf
2 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
indra/llprimitive/llmodel.cpp
View File

@ -1366,7 +1366,8 @@ LLMeshSkinInfo::LLMeshSkinInfo():
LLMeshSkinInfo::LLMeshSkinInfo(LLSD& skin):
mPelvisOffset(0.0),
mLockScaleIfJointPosition(false),
mInvalidJointsScrubbed(false)
mInvalidJointsScrubbed(false),
mJointNumsInitialized(false)
{
fromLLSD(skin);
}

8
indra/newview/llskinningutil.cpp
View File

@ -45,6 +45,8 @@ void dump_avatar_and_skin_state(const std::string& reason, LLVOAvatar *avatar, c
<< " avatar build state: isBuilt() " << avatar->isBuilt()
<< " mInitFlags " << avatar->mInitFlags << LL_ENDL;
LL_WARNS("Avatar") << "Skin num joints " << skin->mJointNames.size() << " " << skin->mJointNums.size() << LL_ENDL;
LL_WARNS("Avatar") << "Skin scrubbed " << skin->mInvalidJointsScrubbed
<< " nums init " << skin->mJointNumsInitialized << LL_ENDL;
for (S32 j=0; j<skin->mJointNames.size(); j++)
{
LL_WARNS("Avatar") << "skin joint idx " << j << " name [" << skin->mJointNames[j]
@ -283,9 +285,9 @@ void LLSkinningUtil::initJointNums(LLMeshSkinInfo* skin, LLVOAvatar *avatar)
}
}
skin->mJointNumsInitialized = true;
LL_WARNS_ONCE("Avatar") << avatar->getFullname() << " jointNums initialized, avatar built " << avatar->isBuilt()
<< " mInitFlags " << avatar->mInitFlags
<< " num joints " << skin->mJointNames.size() << LL_ENDL;
LL_WARNS("Avatar") << avatar->getFullname() << " jointNums initialized, avatar built " << avatar->isBuilt()
<< " mInitFlags " << avatar->mInitFlags
<< " num joints " << skin->mJointNames.size() << LL_ENDL;
}
}