From d273ba2ce2707c6a2fe45c08fdc2524aae19ad00 Mon Sep 17 00:00:00 2001 From: Brian McGroarty Date: Wed, 7 May 2008 20:48:38 +0000 Subject: Back out QAR-520 maintenance-7 merge -- svn merge -r 86947:86946 svn+ssh://svn.lindenlab.com/svn/linden/release dataserver-is-deprecated --- indra/llcharacter/llpose.cpp | 2 -- 1 file changed, 2 deletions(-) (limited to 'indra/llcharacter/llpose.cpp') diff --git a/indra/llcharacter/llpose.cpp b/indra/llcharacter/llpose.cpp index c57fbfdc5d..2120cb223e 100644 --- a/indra/llcharacter/llpose.cpp +++ b/indra/llcharacter/llpose.cpp @@ -188,7 +188,6 @@ LLJointStateBlender::LLJointStateBlender() { mJointStates[i] = NULL; mPriorities[i] = S32_MIN; - mAdditiveBlends[i] = FALSE; } } @@ -459,7 +458,6 @@ void LLJointStateBlender::resetCachedJoint() //----------------------------------------------------------------------------- LLPoseBlender::LLPoseBlender() - : mNextPoseSlot(0) { } -- cgit v1.3