diff options
| author | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2018-07-13 18:56:08 +0100 | 
|---|---|---|
| committer | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2018-07-13 18:56:08 +0100 | 
| commit | 73c76fdccf3da73502403deeab3f2c4e26d68376 (patch) | |
| tree | 7b88a8a34a41c0565a641cf9e52201cf7d0b287b /indra | |
| parent | 3b8b002953b6e867a9c7077107f1287a078029c4 (diff) | |
MAINT-8863 - more diagnostics and possible fix
Diffstat (limited to 'indra')
| -rw-r--r-- | indra/llprimitive/llmodel.cpp | 3 | ||||
| -rw-r--r-- | indra/newview/llskinningutil.cpp | 8 | 
2 files changed, 7 insertions, 4 deletions
diff --git a/indra/llprimitive/llmodel.cpp b/indra/llprimitive/llmodel.cpp index a0e835c577..37548e3fe3 100644 --- a/indra/llprimitive/llmodel.cpp +++ b/indra/llprimitive/llmodel.cpp @@ -1366,7 +1366,8 @@ LLMeshSkinInfo::LLMeshSkinInfo():  LLMeshSkinInfo::LLMeshSkinInfo(LLSD& skin):      mPelvisOffset(0.0),      mLockScaleIfJointPosition(false), -    mInvalidJointsScrubbed(false) +    mInvalidJointsScrubbed(false), +    mJointNumsInitialized(false)  {  	fromLLSD(skin);  } diff --git a/indra/newview/llskinningutil.cpp b/indra/newview/llskinningutil.cpp index 0799715ae0..72252aebde 100644 --- a/indra/newview/llskinningutil.cpp +++ b/indra/newview/llskinningutil.cpp @@ -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;      }  }  | 
