aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden/indra/llcharacter/llkeyframewalkmotion.h
diff options
context:
space:
mode:
authorJacek Antonelli2008-08-15 23:45:27 -0500
committerJacek Antonelli2008-08-15 23:45:27 -0500
commita8a62201ba762e98dff92cf49033e577fc34d8d4 (patch)
tree11f8513c5cdc222f2fac0c93eb724c089803c200 /linden/indra/llcharacter/llkeyframewalkmotion.h
parentSecond Life viewer sources 1.18.6.4-RC (diff)
downloadmeta-impy-a8a62201ba762e98dff92cf49033e577fc34d8d4.zip
meta-impy-a8a62201ba762e98dff92cf49033e577fc34d8d4.tar.gz
meta-impy-a8a62201ba762e98dff92cf49033e577fc34d8d4.tar.bz2
meta-impy-a8a62201ba762e98dff92cf49033e577fc34d8d4.tar.xz
Second Life viewer sources 1.19.0.0
Diffstat (limited to '')
-rw-r--r--linden/indra/llcharacter/llkeyframewalkmotion.h10
1 files changed, 5 insertions, 5 deletions
diff --git a/linden/indra/llcharacter/llkeyframewalkmotion.h b/linden/indra/llcharacter/llkeyframewalkmotion.h
index 3c5a0cb..1a4e39f 100644
--- a/linden/indra/llcharacter/llkeyframewalkmotion.h
+++ b/linden/indra/llcharacter/llkeyframewalkmotion.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,
@@ -123,7 +123,7 @@ public:
123 LLCharacter *mCharacter; 123 LLCharacter *mCharacter;
124 LLJoint* mLeftAnkleJoint; 124 LLJoint* mLeftAnkleJoint;
125 LLJoint* mRightAnkleJoint; 125 LLJoint* mRightAnkleJoint;
126 LLJointState mPelvisState; 126 LLPointer<LLJointState> mPelvisState;
127 LLJoint* mPelvisJoint; 127 LLJoint* mPelvisJoint;
128 LLVector3d mLastLeftAnklePos; 128 LLVector3d mLastLeftAnklePos;
129 LLVector3d mLastRightAnklePos; 129 LLVector3d mLastRightAnklePos;
@@ -141,7 +141,7 @@ class LLFlyAdjustMotion : public LLMotion
141{ 141{
142public: 142public:
143 // Constructor 143 // Constructor
144 LLFlyAdjustMotion(const LLUUID &id) : LLMotion(id) {mName = "fly_adjust";} 144 LLFlyAdjustMotion(const LLUUID &id);
145 145
146public: 146public:
147 //------------------------------------------------------------------------- 147 //-------------------------------------------------------------------------
@@ -173,7 +173,7 @@ protected:
173 // Member Data 173 // Member Data
174 //------------------------------------------------------------------------- 174 //-------------------------------------------------------------------------
175 LLCharacter *mCharacter; 175 LLCharacter *mCharacter;
176 LLJointState mPelvisState; 176 LLPointer<LLJointState> mPelvisState;
177 F32 mRoll; 177 F32 mRoll;
178}; 178};
179 179