Merge

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();
+						}
 					}
 				}				
 			}