diff options
Diffstat (limited to 'linden/indra/llcharacter/llkeyframemotionparam.h')
-rw-r--r-- | linden/indra/llcharacter/llkeyframemotionparam.h | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/linden/indra/llcharacter/llkeyframemotionparam.h b/linden/indra/llcharacter/llkeyframemotionparam.h index 75977ee..a5bc2cb 100644 --- a/linden/indra/llcharacter/llkeyframemotionparam.h +++ b/linden/indra/llcharacter/llkeyframemotionparam.h | |||
@@ -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, |
@@ -145,7 +145,6 @@ protected: | |||
145 | 145 | ||
146 | typedef LLLinkedList < ParameterizedMotion > motion_list_t; | 146 | typedef LLLinkedList < ParameterizedMotion > motion_list_t; |
147 | LLAssocList <std::string, motion_list_t* > mParameterizedMotions; | 147 | LLAssocList <std::string, motion_list_t* > mParameterizedMotions; |
148 | LLJointState* mJointStates; | ||
149 | LLMotion* mDefaultKeyframeMotion; | 148 | LLMotion* mDefaultKeyframeMotion; |
150 | LLCharacter* mCharacter; | 149 | LLCharacter* mCharacter; |
151 | LLPoseBlender mPoseBlender; | 150 | LLPoseBlender mPoseBlender; |