From b01d567a5d9e2b5dd28bcc7b3f474fabd93e7a2f Mon Sep 17 00:00:00 2001 From: Steven Bennetts Date: Fri, 7 Dec 2007 20:27:13 +0000 Subject: EFFECTIVE MERGE: merge release@73232 maint-viewer-2@75100 -> maint-viewer-2-merge EFFECTIVE MERGE: merge -r 74370 library-update -> maint-viewer-2-merge ACTUAL MERGE: release@75267 maint-viewer-2-merge@75293 -> release --- indra/llcharacter/llkeyframemotionparam.cpp | 1 - 1 file changed, 1 deletion(-) (limited to 'indra/llcharacter/llkeyframemotionparam.cpp') diff --git a/indra/llcharacter/llkeyframemotionparam.cpp b/indra/llcharacter/llkeyframemotionparam.cpp index dd64ef2135..f54d1f4a83 100644 --- a/indra/llcharacter/llkeyframemotionparam.cpp +++ b/indra/llcharacter/llkeyframemotionparam.cpp @@ -61,7 +61,6 @@ BOOL LLKeyframeMotionParam::sortFunc(ParameterizedMotion *new_motion, Parameteri //----------------------------------------------------------------------------- LLKeyframeMotionParam::LLKeyframeMotionParam( const LLUUID &id) : LLMotion(id) { - mJointStates = NULL; mDefaultKeyframeMotion = NULL; mCharacter = NULL; -- cgit v1.2.3