From ce7682c2a468e926d6b38e4f95bd289a8d26222c Mon Sep 17 00:00:00 2001 From: Bryan O'Sullivan Date: Wed, 18 Jul 2007 21:22:40 +0000 Subject: svn merge -r64837:65485 svn+ssh://svn.lindenlab.com/svn/linden/branches/maintenance --> release (only inside indra) (josh) Original log message was: svn merge -r64837:65485 svn+ssh://svn.lindenlab.com/svn/linden/branches/maintenance bos updated it to be: svn merge -r64837:65269 svn+ssh://svn.lindenlab.com/svn/linden/branches/maintenance However, it appears it actually was: svn merge -r64837:65485 svn+ssh://svn.lindenlab.com/svn/linden/branches/maintenance ... missing some file additions. --- indra/llcharacter/lljoint.cpp | 33 --------------------------------- 1 file changed, 33 deletions(-) (limited to 'indra/llcharacter/lljoint.cpp') diff --git a/indra/llcharacter/lljoint.cpp b/indra/llcharacter/lljoint.cpp index 3797b06aa1..acc64e6afd 100644 --- a/indra/llcharacter/lljoint.cpp +++ b/indra/llcharacter/lljoint.cpp @@ -465,39 +465,6 @@ void LLJoint::setSkinOffset( const LLVector3& offset ) mSkinOffset = offset; } -//----------------------------------------------------------------------------- -// setConstraintSilhouette() -//----------------------------------------------------------------------------- -void LLJoint::setConstraintSilhouette(LLDynamicArray& silhouette) -{ - S32 i; - - mConstraintSilhouette.reset(); - for (i = 0; i < silhouette.count(); i++) - { - if (i % 2 == 1) - { - // skip normals - continue; - } - mConstraintSilhouette[i / 2] = silhouette[i]; - } - LLQuaternion inv_parent_rotation = LLQuaternion::DEFAULT; - - if (getParent()) - { - inv_parent_rotation = ~getParent()->getWorldRotation(); - } - - for (i = 0; i < mConstraintSilhouette.count(); i++) - { - LLVector3 vert = mConstraintSilhouette[i]; - - vert -= getWorldPosition(); - vert.normVec(); - vert = vert * inv_parent_rotation; - } -} //----------------------------------------------------------------------------- // clampRotation() -- cgit v1.2.3