Second Life viewer sources 1.18.3.2-RC

3 files changed, 15 insertions, 12 deletions

diff --git a/linden/indra/llcharacter/llkeyframemotion.cpp b/linden/indra/llcharacter/llkeyframemotion.cpp
index e5d610a..cf489aa 100644
--- a/linden/indra/llcharacter/llkeyframemotion.cpp
+++ b/linden/indra/llcharacter/llkeyframemotion.cpp
@@ -425,15 +425,17 @@ void LLKeyframeMotion::JointMotion::update(LLJointState* joint_state, F32 time,
 // LLKeyframeMotion()
 // Class Constructor
 //-----------------------------------------------------------------------------
-LLKeyframeMotion::LLKeyframeMotion( const LLUUID &id) : LLMotion(id)
+LLKeyframeMotion::LLKeyframeMotion(const LLUUID &id) 
+        : LLMotion(id),
+                mJointMotionList(NULL),
+                mJointStates(NULL),
+                mPelvisp(NULL),
+                mLastSkeletonSerialNum(0),
+                mLastUpdateTime(0.f),
+                mLastLoopedTime(0.f),
+                mAssetStatus(ASSET_UNDEFINED)
 {
-        mJointMotionList = NULL;
-        mJointStates = NULL;
-        mLastSkeletonSerialNum = 0;
-        mLastLoopedTime = 0.f;
-        mLastUpdateTime = 0.f;
-        mAssetStatus = ASSET_UNDEFINED;
-        mPelvisp = NULL;
+
 }
 
 
@@ -1738,7 +1740,7 @@ BOOL LLKeyframeMotion::serialize(LLDataPacker& dp) const
         }       
 
         success &= dp.packS32(mJointMotionList->mConstraints.size(), "num_constraints");
-        for (JointMotionList::constraint_list_t::iterator iter = mJointMotionList->mConstraints.begin();
+        for (JointMotionList::constraint_list_t::const_iterator iter = mJointMotionList->mConstraints.begin();
                  iter != mJointMotionList->mConstraints.end(); ++iter)
         {
                 JointConstraintSharedData* shared_constraintp = *iter;
@@ -1933,7 +1935,7 @@ void LLKeyframeMotion::setLoopOut(F32 out_point)
 void LLKeyframeMotion::onLoadComplete(LLVFS *vfs,
                                                                            const LLUUID& asset_uuid,
                                                                            LLAssetType::EType type,
-                                                                           void* user_data, S32 status)
+                                                                           void* user_data, S32 status, LLExtStat ext_status)
 {
         LLUUID* id = (LLUUID*)user_data;
                 
diff --git a/linden/indra/llcharacter/llkeyframemotion.h b/linden/indra/llcharacter/llkeyframemotion.h
index 1e5cd62..9e1b11d 100644
--- a/linden/indra/llcharacter/llkeyframemotion.h
+++ b/linden/indra/llcharacter/llkeyframemotion.h
@@ -144,7 +144,7 @@ public:
         static void onLoadComplete(LLVFS *vfs,
                                                            const LLUUID& asset_uuid,
                                                            LLAssetType::EType type,
-                                                           void* user_data, S32 status);
+                                                           void* user_data, S32 status, LLExtStat ext_status);
 
 public:
         U32             getFileSize();
@@ -456,3 +456,4 @@ public:
 
 #endif // LL_LLKEYFRAMEMOTION_H
 
+
diff --git a/linden/indra/llcharacter/llmultigesture.cpp b/linden/indra/llcharacter/llmultigesture.cpp
index 0a4d99a..e92fcbd 100644
--- a/linden/indra/llcharacter/llmultigesture.cpp
+++ b/linden/indra/llcharacter/llmultigesture.cpp
@@ -278,7 +278,7 @@ BOOL LLGestureStepAnimation::deserialize(LLDataPacker& dp)
 
         // Apparently an earlier version of the gesture code added \r to the end
         // of the animation names.  Get rid of it.  JC
-        if (mAnimName[mAnimName.length() - 1] == '\r')
+        if (!mAnimName.empty() && mAnimName[mAnimName.length() - 1] == '\r')
         {
                 // chop the last character
                 mAnimName.resize(mAnimName.length() - 1);