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/llmotion.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'indra/llcharacter/llmotion.cpp') diff --git a/indra/llcharacter/llmotion.cpp b/indra/llcharacter/llmotion.cpp index e674620d42..bf332ed838 100644 --- a/indra/llcharacter/llmotion.cpp +++ b/indra/llcharacter/llmotion.cpp @@ -106,7 +106,7 @@ void LLMotion::fadeIn() //----------------------------------------------------------------------------- // addJointState() //----------------------------------------------------------------------------- -void LLMotion::addJointState(LLJointState* jointState) +void LLMotion::addJointState(const LLPointer& jointState) { mPose.addJointState(jointState); S32 priority = jointState->getPriority(); -- cgit v1.2.3