diff options
| author | Steven Bennetts <steve@lindenlab.com> | 2007-12-07 20:27:13 +0000 |
|---|---|---|
| committer | Steven Bennetts <steve@lindenlab.com> | 2007-12-07 20:27:13 +0000 |
| commit | b01d567a5d9e2b5dd28bcc7b3f474fabd93e7a2f (patch) | |
| tree | c45377783f53f033d43a4d06d36bbeb2a7f7e79b /indra/llcharacter/llmotion.cpp | |
| parent | a64f283477ea4db09c8b515ab94709e1fb5c82af (diff) | |
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
Diffstat (limited to 'indra/llcharacter/llmotion.cpp')
| -rw-r--r-- | indra/llcharacter/llmotion.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
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<LLJointState>& jointState) { mPose.addJointState(jointState); S32 priority = jointState->getPriority(); |