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.

1 files changed, 0 insertions, 33 deletions

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<LLVector3>& 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()