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.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'indra/llcharacter/llmotion.h') diff --git a/indra/llcharacter/llmotion.h b/indra/llcharacter/llmotion.h index 2b5c5aad5e..7669920339 100644 --- a/indra/llcharacter/llmotion.h +++ b/indra/llcharacter/llmotion.h @@ -163,7 +163,7 @@ protected: // it will be deactivated virtual BOOL onActivate() = 0; - void addJointState(LLJointState* jointState); + void addJointState(const LLPointer& jointState); protected: LLPose mPose; -- cgit v1.3