1 files changed, 12 insertions, 6 deletions

diff --git a/linden/indra/llcharacter/llkeyframemotion.h b/linden/indra/llcharacter/llkeyframemotion.h
index ef3f6dd..0ad0181 100644
--- a/linden/indra/llcharacter/llkeyframemotion.h
+++ b/linden/indra/llcharacter/llkeyframemotion.h
@@ -12,12 +12,12 @@
  * ("GPL"), unless you have obtained a separate licensing agreement
  * ("Other License"), formally executed by you and Linden Lab.  Terms of
  * the GPL can be found in doc/GPL-license.txt in this distribution, or
- * online at http://secondlife.com/developers/opensource/gplv2
+ * online at http://secondlifegrid.net/programs/open_source/licensing/gplv2
  * 
  * There are special exceptions to the terms and conditions of the GPL as
  * it is applied to this Source Code. View the full text of the exception
  * in the file doc/FLOSS-exception.txt in this software distribution, or
- * online at http://secondlife.com/developers/opensource/flossexception
+ * online at http://secondlifegrid.net/programs/open_source/licensing/flossexception
  * 
  * By copying, modifying or distributing this software, you acknowledge
  * that you have read and understood your obligations described above,
@@ -73,6 +73,11 @@ public:
         // Destructor
         virtual ~LLKeyframeMotion();
 
+private:
+        // private helper functions to wrap some asserts
+        LLPointer<LLJointState>& getJointState(U32 index);
+        LLJoint* getJoint(U32 index);
+        
 public:
         //-------------------------------------------------------------------------
         // functions to support MotionController and MotionRegistry
@@ -388,7 +393,7 @@ public:
                 U32                             mUsage;
                 LLJoint::JointPriority  mPriority;
 
-                void update(LLJointState *joint_state, F32 time, F32 duration);
+                void update(LLJointState* joint_state, F32 time, F32 duration);
         };
         
         //-------------------------------------------------------------------------
@@ -397,8 +402,7 @@ public:
         class JointMotionList
         {
         public:
-                U32                                             mNumJointMotions;
-                JointMotion*                    mJointMotionArray;
+                std::vector<JointMotion*> mJointMotionArray;
                 F32                                             mDuration;
                 BOOL                                    mLoop;
                 F32                                             mLoopInPoint;
@@ -415,6 +419,8 @@ public:
                 JointMotionList();
                 ~JointMotionList();
                 U32 dumpDiagInfo();
+                JointMotion* getJointMotion(U32 index) const { llassert(index < mJointMotionArray.size()); return mJointMotionArray[index]; }
+                U32 getNumJointMotions() const { return mJointMotionArray.size(); }
         };
 
 
@@ -425,7 +431,7 @@ protected:
         // Member Data
         //-------------------------------------------------------------------------
         JointMotionList*                                mJointMotionList;
-        LLJointState*                                   mJointStates;
+        std::vector<LLPointer<LLJointState> > mJointStates;
         LLJoint*                                                mPelvisp;
         LLCharacter*                                    mCharacter;
         std::string                                             mEmoteName;