diff options
| author | Loren Shih <seraph@lindenlab.com> | 2011-01-06 11:01:17 -0500 |
|---|---|---|
| committer | Loren Shih <seraph@lindenlab.com> | 2011-01-06 11:01:17 -0500 |
| commit | 9c6c0463277fc9e193932da736231a47752676c5 (patch) | |
| tree | 6070c94cdce91cd900f95d4f4eae105d1ef2fee7 /indra/newview/llvoavatarself.cpp | |
| parent | 64ca3553b15d20ae190973b5546809c938a39450 (diff) | |
| parent | c9f3a5574e223bec95b4ec374fd164ba9a486c2a (diff) | |
Automated merge from mesh-development
Diffstat (limited to 'indra/newview/llvoavatarself.cpp')
| -rw-r--r-- | indra/newview/llvoavatarself.cpp | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/indra/newview/llvoavatarself.cpp b/indra/newview/llvoavatarself.cpp index 935bd4a588..5d1020fce8 100644 --- a/indra/newview/llvoavatarself.cpp +++ b/indra/newview/llvoavatarself.cpp @@ -1159,10 +1159,15 @@ BOOL LLVOAvatarSelf::detachObject(LLViewerObject *viewer_object) const LLMeshSkinInfo* pSkinData = gMeshRepo.getSkinInfo( pVObj->getVolume()->getParams().getSculptID() ); if ( pSkinData ) { - const int bindCnt = pSkinData->mAlternateBindMatrix.size(); - if ( bindCnt > 0 ) + const int jointCnt = pSkinData->mJointNames.size(); + bool fullRig = ( jointCnt>=20 ) ? true : false; + if ( fullRig ) { - LLVOAvatar::resetJointPositionsToDefault(); + const int bindCnt = pSkinData->mAlternateBindMatrix.size(); + if ( bindCnt > 0 ) + { + LLVOAvatar::resetJointPositionsToDefault(); + } } } } |