diff options
Diffstat (limited to '')
-rw-r--r-- | linden/indra/llcharacter/llmotion.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/linden/indra/llcharacter/llmotion.cpp b/linden/indra/llcharacter/llmotion.cpp index aa5e542..899796c 100644 --- a/linden/indra/llcharacter/llmotion.cpp +++ b/linden/indra/llcharacter/llmotion.cpp | |||
@@ -12,12 +12,12 @@ | |||
12 | * ("GPL"), unless you have obtained a separate licensing agreement | 12 | * ("GPL"), unless you have obtained a separate licensing agreement |
13 | * ("Other License"), formally executed by you and Linden Lab. Terms of | 13 | * ("Other License"), formally executed by you and Linden Lab. Terms of |
14 | * the GPL can be found in doc/GPL-license.txt in this distribution, or | 14 | * the GPL can be found in doc/GPL-license.txt in this distribution, or |
15 | * online at http://secondlife.com/developers/opensource/gplv2 | 15 | * online at http://secondlifegrid.net/programs/open_source/licensing/gplv2 |
16 | * | 16 | * |
17 | * There are special exceptions to the terms and conditions of the GPL as | 17 | * There are special exceptions to the terms and conditions of the GPL as |
18 | * it is applied to this Source Code. View the full text of the exception | 18 | * it is applied to this Source Code. View the full text of the exception |
19 | * in the file doc/FLOSS-exception.txt in this software distribution, or | 19 | * in the file doc/FLOSS-exception.txt in this software distribution, or |
20 | * online at http://secondlife.com/developers/opensource/flossexception | 20 | * online at http://secondlifegrid.net/programs/open_source/licensing/flossexception |
21 | * | 21 | * |
22 | * By copying, modifying or distributing this software, you acknowledge | 22 | * By copying, modifying or distributing this software, you acknowledge |
23 | * that you have read and understood your obligations described above, | 23 | * that you have read and understood your obligations described above, |
@@ -106,7 +106,7 @@ void LLMotion::fadeIn() | |||
106 | //----------------------------------------------------------------------------- | 106 | //----------------------------------------------------------------------------- |
107 | // addJointState() | 107 | // addJointState() |
108 | //----------------------------------------------------------------------------- | 108 | //----------------------------------------------------------------------------- |
109 | void LLMotion::addJointState(LLJointState* jointState) | 109 | void LLMotion::addJointState(const LLPointer<LLJointState>& jointState) |
110 | { | 110 | { |
111 | mPose.addJointState(jointState); | 111 | mPose.addJointState(jointState); |
112 | S32 priority = jointState->getPriority(); | 112 | S32 priority = jointState->getPriority(); |