43 files changed, 218 insertions, 163 deletions

diff --git a/linden/indra/llcharacter/llanimationstates.cpp b/linden/indra/llcharacter/llanimationstates.cpp
index 8687dfb..95aa5d6 100644
--- a/linden/indra/llcharacter/llanimationstates.cpp
+++ b/linden/indra/llcharacter/llanimationstates.cpp
@@ -4,6 +4,7 @@
  *
  * Copyright (c) 2001-2007, Linden Research, Inc.
  * 
+ * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
  * to you under the terms of the GNU General Public License, version 2.0
  * ("GPL"), unless you have obtained a separate licensing agreement
diff --git a/linden/indra/llcharacter/llanimationstates.h b/linden/indra/llcharacter/llanimationstates.h
index 75e2f67..6a9f7a4 100644
--- a/linden/indra/llcharacter/llanimationstates.h
+++ b/linden/indra/llcharacter/llanimationstates.h
@@ -4,6 +4,7 @@
  *
  * Copyright (c) 2001-2007, Linden Research, Inc.
  * 
+ * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
  * to you under the terms of the GNU General Public License, version 2.0
  * ("GPL"), unless you have obtained a separate licensing agreement
diff --git a/linden/indra/llcharacter/llbvhloader.cpp b/linden/indra/llcharacter/llbvhloader.cpp
index 48b5e7c..9f7e901 100644
--- a/linden/indra/llcharacter/llbvhloader.cpp
+++ b/linden/indra/llcharacter/llbvhloader.cpp
@@ -4,6 +4,7 @@
  *
  * Copyright (c) 2004-2007, Linden Research, Inc.
  * 
+ * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
  * to you under the terms of the GNU General Public License, version 2.0
  * ("GPL"), unless you have obtained a separate licensing agreement
@@ -175,7 +176,7 @@ LLBVHLoader::Status LLBVHLoader::loadTranslationTable(const char *fileName)
         //--------------------------------------------------------------------
         char path[LL_MAX_PATH];         /* Flawfinder: ignore */
 
-        snprintf( path, sizeof(path), "%s",/* Flawfinder: ignore */
+        snprintf( path, sizeof(path), "%s",     /* Flawfinder: ignore */
                 gDirUtilp->getExpandedFilename(LL_PATH_APP_SETTINGS,fileName).c_str()); 
 
 
diff --git a/linden/indra/llcharacter/llbvhloader.h b/linden/indra/llcharacter/llbvhloader.h
index 0ae31ef..0a4f9a9 100644
--- a/linden/indra/llcharacter/llbvhloader.h
+++ b/linden/indra/llcharacter/llbvhloader.h
@@ -4,6 +4,7 @@
  *
  * Copyright (c) 2004-2007, Linden Research, Inc.
  * 
+ * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
  * to you under the terms of the GNU General Public License, version 2.0
  * ("GPL"), unless you have obtained a separate licensing agreement
diff --git a/linden/indra/llcharacter/llcharacter.cpp b/linden/indra/llcharacter/llcharacter.cpp
index 6e9327f..90a3cc6 100644
--- a/linden/indra/llcharacter/llcharacter.cpp
+++ b/linden/indra/llcharacter/llcharacter.cpp
@@ -4,6 +4,7 @@
  *
  * Copyright (c) 2001-2007, Linden Research, Inc.
  * 
+ * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
  * to you under the terms of the GNU General Public License, version 2.0
  * ("GPL"), unless you have obtained a separate licensing agreement
diff --git a/linden/indra/llcharacter/llcharacter.h b/linden/indra/llcharacter/llcharacter.h
index 6f4fe17..90824aa 100644
--- a/linden/indra/llcharacter/llcharacter.h
+++ b/linden/indra/llcharacter/llcharacter.h
@@ -4,6 +4,7 @@
  *
  * Copyright (c) 2001-2007, Linden Research, Inc.
  * 
+ * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
  * to you under the terms of the GNU General Public License, version 2.0
  * ("GPL"), unless you have obtained a separate licensing agreement
@@ -127,7 +128,7 @@ public:
         // updates all visual parameters for this character
         virtual void updateVisualParams();
 
-        virtual void addDebugText( const char* text ) = 0;
+        virtual void addDebugText( const std::string& text ) = 0;
 
         virtual const LLUUID&   getID() = 0;
         //-------------------------------------------------------------------------
diff --git a/linden/indra/llcharacter/lleditingmotion.cpp b/linden/indra/llcharacter/lleditingmotion.cpp
index 66608f8..08d7940 100644
--- a/linden/indra/llcharacter/lleditingmotion.cpp
+++ b/linden/indra/llcharacter/lleditingmotion.cpp
@@ -4,6 +4,7 @@
  *
  * Copyright (c) 2001-2007, Linden Research, Inc.
  * 
+ * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
  * to you under the terms of the GNU General Public License, version 2.0
  * ("GPL"), unless you have obtained a separate licensing agreement
diff --git a/linden/indra/llcharacter/lleditingmotion.h b/linden/indra/llcharacter/lleditingmotion.h
index 37df991..6ca6765 100644
--- a/linden/indra/llcharacter/lleditingmotion.h
+++ b/linden/indra/llcharacter/lleditingmotion.h
@@ -4,6 +4,7 @@
  *
  * Copyright (c) 2001-2007, Linden Research, Inc.
  * 
+ * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
  * to you under the terms of the GNU General Public License, version 2.0
  * ("GPL"), unless you have obtained a separate licensing agreement
diff --git a/linden/indra/llcharacter/llgesture.cpp b/linden/indra/llcharacter/llgesture.cpp
index 944df78..231047d 100644
--- a/linden/indra/llcharacter/llgesture.cpp
+++ b/linden/indra/llcharacter/llgesture.cpp
@@ -3,6 +3,7 @@
  *
  * Copyright (c) 2002-2007, Linden Research, Inc.
  * 
+ * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
  * to you under the terms of the GNU General Public License, version 2.0
  * ("GPL"), unless you have obtained a separate licensing agreement
diff --git a/linden/indra/llcharacter/llgesture.h b/linden/indra/llcharacter/llgesture.h
index 5180be0..dc2b10c 100644
--- a/linden/indra/llcharacter/llgesture.h
+++ b/linden/indra/llcharacter/llgesture.h
@@ -5,6 +5,7 @@
  *
  * Copyright (c) 2002-2007, Linden Research, Inc.
  * 
+ * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
  * to you under the terms of the GNU General Public License, version 2.0
  * ("GPL"), unless you have obtained a separate licensing agreement
diff --git a/linden/indra/llcharacter/llhandmotion.cpp b/linden/indra/llcharacter/llhandmotion.cpp
index 12ef070..96b1dc7 100644
--- a/linden/indra/llcharacter/llhandmotion.cpp
+++ b/linden/indra/llcharacter/llhandmotion.cpp
@@ -4,6 +4,7 @@
  *
  * Copyright (c) 2001-2007, Linden Research, Inc.
  * 
+ * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
  * to you under the terms of the GNU General Public License, version 2.0
  * ("GPL"), unless you have obtained a separate licensing agreement
diff --git a/linden/indra/llcharacter/llhandmotion.h b/linden/indra/llcharacter/llhandmotion.h
index 3f3dac6..b909818 100644
--- a/linden/indra/llcharacter/llhandmotion.h
+++ b/linden/indra/llcharacter/llhandmotion.h
@@ -4,6 +4,7 @@
  *
  * Copyright (c) 2001-2007, Linden Research, Inc.
  * 
+ * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
  * to you under the terms of the GNU General Public License, version 2.0
  * ("GPL"), unless you have obtained a separate licensing agreement
diff --git a/linden/indra/llcharacter/llheadrotmotion.cpp b/linden/indra/llcharacter/llheadrotmotion.cpp
index 1d1771d..be0b55d 100644
--- a/linden/indra/llcharacter/llheadrotmotion.cpp
+++ b/linden/indra/llcharacter/llheadrotmotion.cpp
@@ -4,6 +4,7 @@
  *
  * Copyright (c) 2001-2007, Linden Research, Inc.
  * 
+ * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
  * to you under the terms of the GNU General Public License, version 2.0
  * ("GPL"), unless you have obtained a separate licensing agreement
diff --git a/linden/indra/llcharacter/llheadrotmotion.h b/linden/indra/llcharacter/llheadrotmotion.h
index 1412354..bdb82aa 100644
--- a/linden/indra/llcharacter/llheadrotmotion.h
+++ b/linden/indra/llcharacter/llheadrotmotion.h
@@ -4,6 +4,7 @@
  *
  * Copyright (c) 2001-2007, Linden Research, Inc.
  * 
+ * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
  * to you under the terms of the GNU General Public License, version 2.0
  * ("GPL"), unless you have obtained a separate licensing agreement
diff --git a/linden/indra/llcharacter/lljoint.cpp b/linden/indra/llcharacter/lljoint.cpp
index 4102612..6141cc0 100644
--- a/linden/indra/llcharacter/lljoint.cpp
+++ b/linden/indra/llcharacter/lljoint.cpp
@@ -4,6 +4,7 @@
  *
  * Copyright (c) 2001-2007, Linden Research, Inc.
  * 
+ * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
  * to you under the terms of the GNU General Public License, version 2.0
  * ("GPL"), unless you have obtained a separate licensing agreement
diff --git a/linden/indra/llcharacter/lljoint.h b/linden/indra/llcharacter/lljoint.h
index 352d222..f188968 100644
--- a/linden/indra/llcharacter/lljoint.h
+++ b/linden/indra/llcharacter/lljoint.h
@@ -4,6 +4,7 @@
  *
  * Copyright (c) 2001-2007, Linden Research, Inc.
  * 
+ * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
  * to you under the terms of the GNU General Public License, version 2.0
  * ("GPL"), unless you have obtained a separate licensing agreement
diff --git a/linden/indra/llcharacter/lljointsolverrp3.cpp b/linden/indra/llcharacter/lljointsolverrp3.cpp
index 2221a53..9ecb31b 100644
--- a/linden/indra/llcharacter/lljointsolverrp3.cpp
+++ b/linden/indra/llcharacter/lljointsolverrp3.cpp
@@ -4,6 +4,7 @@
  *
  * Copyright (c) 2001-2007, Linden Research, Inc.
  * 
+ * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
  * to you under the terms of the GNU General Public License, version 2.0
  * ("GPL"), unless you have obtained a separate licensing agreement
diff --git a/linden/indra/llcharacter/lljointsolverrp3.h b/linden/indra/llcharacter/lljointsolverrp3.h
index 7dd35eb..42f4912 100644
--- a/linden/indra/llcharacter/lljointsolverrp3.h
+++ b/linden/indra/llcharacter/lljointsolverrp3.h
@@ -4,6 +4,7 @@
  *
  * Copyright (c) 2001-2007, Linden Research, Inc.
  * 
+ * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
  * to you under the terms of the GNU General Public License, version 2.0
  * ("GPL"), unless you have obtained a separate licensing agreement
diff --git a/linden/indra/llcharacter/lljointstate.h b/linden/indra/llcharacter/lljointstate.h
index 7fef28a..8b55410 100644
--- a/linden/indra/llcharacter/lljointstate.h
+++ b/linden/indra/llcharacter/lljointstate.h
@@ -4,6 +4,7 @@
  *
  * Copyright (c) 2001-2007, Linden Research, Inc.
  * 
+ * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
  * to you under the terms of the GNU General Public License, version 2.0
  * ("GPL"), unless you have obtained a separate licensing agreement
diff --git a/linden/indra/llcharacter/llkeyframefallmotion.cpp b/linden/indra/llcharacter/llkeyframefallmotion.cpp
index 2fca225..d539be6 100644
--- a/linden/indra/llcharacter/llkeyframefallmotion.cpp
+++ b/linden/indra/llcharacter/llkeyframefallmotion.cpp
@@ -4,6 +4,7 @@
  *
  * Copyright (c) 2001-2007, Linden Research, Inc.
  * 
+ * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
  * to you under the terms of the GNU General Public License, version 2.0
  * ("GPL"), unless you have obtained a separate licensing agreement
diff --git a/linden/indra/llcharacter/llkeyframefallmotion.h b/linden/indra/llcharacter/llkeyframefallmotion.h
index ddf4c45..b6a4e68 100644
--- a/linden/indra/llcharacter/llkeyframefallmotion.h
+++ b/linden/indra/llcharacter/llkeyframefallmotion.h
@@ -4,6 +4,7 @@
  *
  * Copyright (c) 2001-2007, Linden Research, Inc.
  * 
+ * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
  * to you under the terms of the GNU General Public License, version 2.0
  * ("GPL"), unless you have obtained a separate licensing agreement
diff --git a/linden/indra/llcharacter/llkeyframemotion.cpp b/linden/indra/llcharacter/llkeyframemotion.cpp
index d09de0e..94e45b6 100644
--- a/linden/indra/llcharacter/llkeyframemotion.cpp
+++ b/linden/indra/llcharacter/llkeyframemotion.cpp
@@ -4,6 +4,7 @@
  *
  * Copyright (c) 2001-2007, Linden Research, Inc.
  * 
+ * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
  * to you under the terms of the GNU General Public License, version 2.0
  * ("GPL"), unless you have obtained a separate licensing agreement
@@ -48,7 +49,7 @@
 // Static Definitions
 //-----------------------------------------------------------------------------
 LLVFS*                          LLKeyframeMotion::sVFS = NULL;
-LLKeyframeDataCache::LLKeyframeDataMap  LLKeyframeDataCache::sKeyframeDataMap;
+LLKeyframeDataCache::keyframe_data_map_t        LLKeyframeDataCache::sKeyframeDataMap;
 
 //-----------------------------------------------------------------------------
 // Globals
@@ -64,8 +65,20 @@ static F32 MIN_ACCELERATION_SQUARED = 0.0005f * 0.0005f;
 static F32 MAX_CONSTRAINTS = 10;
 
 //-----------------------------------------------------------------------------
-// JointMotionList::dumpDiagInfo()
+// JointMotionList
 //-----------------------------------------------------------------------------
+LLKeyframeMotion::JointMotionList::JointMotionList()
+        : mNumJointMotions(0),
+          mJointMotionArray(NULL)
+{
+}
+
+LLKeyframeMotion::JointMotionList::~JointMotionList()
+{
+        for_each(mConstraints.begin(), mConstraints.end(), DeletePointer());
+        delete [] mJointMotionArray;
+}
+
 U32 LLKeyframeMotion::JointMotionList::dumpDiagInfo()
 {
         S32     total_size = sizeof(JointMotionList);
@@ -434,7 +447,7 @@ LLKeyframeMotion::~LLKeyframeMotion()
         {
                 delete [] mJointStates;
         }
-        mConstraints.deleteAllData();
+        for_each(mConstraints.begin(), mConstraints.end(), DeletePointer());
 }
 
 //-----------------------------------------------------------------------------
@@ -569,8 +582,7 @@ LLMotion::LLMotionInitStatus LLKeyframeMotion::onInitialize(LLCharacter *charact
 BOOL LLKeyframeMotion::setupPose()
 {
         // add all valid joint states to the pose
-        U32 jm;
-        for (jm=0; jm<mJointMotionList->mNumJointMotions; jm++)
+        for (U32 jm=0; jm<mJointMotionList->mNumJointMotions; jm++)
         {
                 if ( mJointStates[jm].getJoint() )
                 {
@@ -579,16 +591,16 @@ BOOL LLKeyframeMotion::setupPose()
         }
 
         // initialize joint constraints
-        for (JointConstraintSharedData* shared_constraintp = mJointMotionList->mConstraints.getFirstData();
-                shared_constraintp;
-                shared_constraintp = mJointMotionList->mConstraints.getNextData())
-                {
-                        JointConstraint* constraintp = new JointConstraint(shared_constraintp);
-                        initializeConstraint(constraintp);
-                        mConstraints.addData(constraintp);
-                }
+        for (JointMotionList::constraint_list_t::iterator iter = mJointMotionList->mConstraints.begin();
+                 iter != mJointMotionList->mConstraints.end(); ++iter)
+        {
+                JointConstraintSharedData* shared_constraintp = *iter;
+                JointConstraint* constraintp = new JointConstraint(shared_constraintp);
+                initializeConstraint(constraintp);
+                mConstraints.push_front(constraintp);
+        }
 
-        if (mJointMotionList->mConstraints.getLength())
+        if (mJointMotionList->mConstraints.size())
         {
                 mPelvisp = mCharacter->getJoint("mPelvis");
                 if (!mPelvisp)
@@ -711,21 +723,21 @@ void LLKeyframeMotion::applyConstraints(F32 time, U8* joint_mask)
         if (mCharacter->getSkeletonSerialNum() != mLastSkeletonSerialNum)
         {
                 mLastSkeletonSerialNum = mCharacter->getSkeletonSerialNum();
-                for (JointConstraint* constraintp = mConstraints.getFirstData();
-                        constraintp;
-                        constraintp = mConstraints.getNextData())
-                        {
-                                initializeConstraint(constraintp);
-                        }
+                for (constraint_list_t::iterator iter = mConstraints.begin();
+                         iter != mConstraints.end(); ++iter)
+                {
+                        JointConstraint* constraintp = *iter;
+                        initializeConstraint(constraintp);
+                }
         }
 
         // apply constraints
-        for (JointConstraint* constraintp = mConstraints.getFirstData();
-                constraintp;
-                constraintp = mConstraints.getNextData())
-                {
-                        applyConstraint(constraintp, time, joint_mask);
-                }
+        for (constraint_list_t::iterator iter = mConstraints.begin();
+                 iter != mConstraints.end(); ++iter)
+        {
+                JointConstraint* constraintp = *iter;
+                applyConstraint(constraintp, time, joint_mask);
+        }
 }
 
 //-----------------------------------------------------------------------------
@@ -733,12 +745,12 @@ void LLKeyframeMotion::applyConstraints(F32 time, U8* joint_mask)
 //-----------------------------------------------------------------------------
 void LLKeyframeMotion::onDeactivate()
 {
-        for (JointConstraint* constraintp = mConstraints.getFirstData();
-                constraintp;
-                constraintp = mConstraints.getNextData())
-                {
-                        deactivateConstraint(constraintp);
-                }
+        for (constraint_list_t::iterator iter = mConstraints.begin();
+                 iter != mConstraints.end(); ++iter)
+        {
+                JointConstraint* constraintp = *iter;
+                deactivateConstraint(constraintp);
+        }
 }
 
 //-----------------------------------------------------------------------------
@@ -1605,7 +1617,7 @@ BOOL LLKeyframeMotion::deserialize(LLDataPacker& dp)
                                 return FALSE;
                         }
 
-                        mJointMotionList->mConstraints.addData(constraintp);
+                        mJointMotionList->mConstraints.push_front(constraintp);
 
                         constraintp->mJointStateIndices = new S32[constraintp->mChainLength + 1];
                         
@@ -1713,10 +1725,19 @@ BOOL LLKeyframeMotion::serialize(LLDataPacker& dp) const
                 }
         }       
 
-        success &= dp.packS32(mJointMotionList->mConstraints.getLength(), "num_constraints");
-        for (JointConstraintSharedData* shared_constraintp = mJointMotionList->mConstraints.getFirstData();
-                shared_constraintp;
-                shared_constraintp = mJointMotionList->mConstraints.getNextData())
+        success &= dp.packS32(mJointMotionList->mConstraints.size(), "num_constraints");
+        for (JointMotionList::constraint_list_t::iterator iter = mJointMotionList->mConstraints.begin();
+                 iter != mJointMotionList->mConstraints.end(); ++iter)
+        {
+                JointConstraintSharedData* shared_constraintp = *iter;
+                success &= dp.packU8(shared_constraintp->mChainLength, "chain_length");
+                success &= dp.packU8(shared_constraintp->mConstraintType, "constraint_type");
+                char volume_name[16];   /* Flawfinder: ignore */
+                snprintf(volume_name, sizeof(volume_name), "%s",        /* Flawfinder: ignore */
+                                 mCharacter->findCollisionVolume(shared_constraintp->mSourceConstraintVolume)->getName().c_str()); 
+                success &= dp.packBinaryDataFixed((U8*)volume_name, 16, "source_volume");
+                success &= dp.packVector3(shared_constraintp->mSourceConstraintOffset, "source_offset");
+                if (shared_constraintp->mConstraintTargetType == TYPE_GROUND)
                 {
                         success &= dp.packU8(shared_constraintp->mChainLength, "chain_length");
                         success &= dp.packU8(shared_constraintp->mConstraintType, "constraint_type");
@@ -1731,7 +1752,7 @@ BOOL LLKeyframeMotion::serialize(LLDataPacker& dp) const
                         }
                         else
                         {
-                                snprintf(volume_name, sizeof(volume_name),"%s", /* Flawfinder: ignore */
+                                snprintf(volume_name, sizeof(volume_name),"%s",         /* Flawfinder: ignore */
                                         mCharacter->findCollisionVolume(shared_constraintp->mTargetConstraintVolume)->getName().c_str());       
                         }
                         success &= dp.packBinaryDataFixed((U8*)volume_name, 16, "target_volume");
@@ -1742,6 +1763,19 @@ BOOL LLKeyframeMotion::serialize(LLDataPacker& dp) const
                         success &= dp.packF32(shared_constraintp->mEaseOutStartTime, "ease_out_start");
                         success &= dp.packF32(shared_constraintp->mEaseOutStopTime, "ease_out_stop");
                 }
+                else
+                {
+                        snprintf(volume_name, sizeof(volume_name),"%s", /* Flawfinder: ignore */
+                                         mCharacter->findCollisionVolume(shared_constraintp->mTargetConstraintVolume)->getName().c_str());      
+                }
+                success &= dp.packBinaryDataFixed((U8*)volume_name, 16, "target_volume");
+                success &= dp.packVector3(shared_constraintp->mTargetConstraintOffset, "target_offset");
+                success &= dp.packVector3(shared_constraintp->mTargetConstraintDir, "target_dir");
+                success &= dp.packF32(shared_constraintp->mEaseInStartTime, "ease_in_start");
+                success &= dp.packF32(shared_constraintp->mEaseInStopTime, "ease_in_stop");
+                success &= dp.packF32(shared_constraintp->mEaseOutStartTime, "ease_out_start");
+                success &= dp.packF32(shared_constraintp->mEaseOutStopTime, "ease_out_stop");
+        }
 
         return success;
 }
@@ -1832,7 +1866,8 @@ void LLKeyframeMotion::setEaseOut(F32 ease_in)
 //-----------------------------------------------------------------------------
 void LLKeyframeMotion::flushKeyframeCache()
 {
-        LLKeyframeDataCache::clear();
+        // TODO: Make this safe to do
+//      LLKeyframeDataCache::clear();
 }
 
 //-----------------------------------------------------------------------------
@@ -2041,8 +2076,8 @@ void LLKeyframeDataCache::dumpDiagInfo()
         llinfos << "-----------------------------------------------------" << llendl;
 
         // print each loaded mesh, and it's memory usage
-        LLKeyframeDataMap::iterator map_it;
-        for (map_it = sKeyframeDataMap.begin(); map_it != sKeyframeDataMap.end(); ++map_it)
+        for (keyframe_data_map_t::iterator map_it = sKeyframeDataMap.begin();
+                 map_it != sKeyframeDataMap.end(); ++map_it)
         {
                 U32 joint_motion_kb;
 
@@ -2076,12 +2111,12 @@ void LLKeyframeDataCache::addKeyframeData(const LLUUID& id, LLKeyframeMotion::Jo
 //--------------------------------------------------------------------
 void LLKeyframeDataCache::removeKeyframeData(const LLUUID& id)
 {
-        LLKeyframeMotion::JointMotionList* joint_motion_listp = getKeyframeData(id);
-        if (joint_motion_listp)
+        keyframe_data_map_t::iterator found_data = sKeyframeDataMap.find(id);
+        if (found_data != sKeyframeDataMap.end())
         {
-                delete joint_motion_listp;
+                delete found_data->second;
+                sKeyframeDataMap.erase(found_data);
         }
-        sKeyframeDataMap.erase(id);
 }
 
 //--------------------------------------------------------------------
@@ -2089,7 +2124,7 @@ void LLKeyframeDataCache::removeKeyframeData(const LLUUID& id)
 //--------------------------------------------------------------------
 LLKeyframeMotion::JointMotionList* LLKeyframeDataCache::getKeyframeData(const LLUUID& id)
 {
-        LLKeyframeDataMap::iterator found_data = sKeyframeDataMap.find(id);
+        keyframe_data_map_t::iterator found_data = sKeyframeDataMap.find(id);
         if (found_data == sKeyframeDataMap.end())
         {
                 return NULL;
diff --git a/linden/indra/llcharacter/llkeyframemotion.h b/linden/indra/llcharacter/llkeyframemotion.h
index c33df80..1e5cd62 100644
--- a/linden/indra/llcharacter/llkeyframemotion.h
+++ b/linden/indra/llcharacter/llkeyframemotion.h
@@ -4,6 +4,7 @@
  *
  * Copyright (c) 2001-2007, Linden Research, Inc.
  * 
+ * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
  * to you under the terms of the GNU General Public License, version 2.0
  * ("GPL"), unless you have obtained a separate licensing agreement
@@ -35,7 +36,6 @@
 #include <string>
 
 #include "llassetstorage.h"
-#include "llassoclist.h"
 #include "llbboxlocal.h"
 #include "llhandmotion.h"
 #include "lljointstate.h"
@@ -405,11 +405,12 @@ public:
                 LLJoint::JointPriority  mBasePriority;
                 LLHandMotion::eHandPose mHandPose;
                 LLJoint::JointPriority  mMaxPriority;
-                LLLinkedList<JointConstraintSharedData> mConstraints;
+                typedef std::list<JointConstraintSharedData*> constraint_list_t;
+                constraint_list_t               mConstraints;
                 LLBBoxLocal                             mPelvisBBox;
         public:
-                JointMotionList() : mNumJointMotions(0), mJointMotionArray(NULL) {};
-                ~JointMotionList() { mConstraints.deleteAllData(); delete [] mJointMotionArray; }
+                JointMotionList();
+                ~JointMotionList();
                 U32 dumpDiagInfo();
         };
 
@@ -425,7 +426,8 @@ protected:
         LLJoint*                                                mPelvisp;
         LLCharacter*                                    mCharacter;
         std::string                                             mEmoteName;
-        LLLinkedList<JointConstraint>   mConstraints;
+        typedef std::list<JointConstraint*>     constraint_list_t;
+        constraint_list_t                               mConstraints;
         U32                                                             mLastSkeletonSerialNum;
         F32                                                             mLastUpdateTime;
         F32                                                             mLastLoopedTime;
@@ -439,8 +441,8 @@ public:
         LLKeyframeDataCache(){};
         ~LLKeyframeDataCache();
 
-        typedef std::map<LLUUID, class LLKeyframeMotion::JointMotionList*> LLKeyframeDataMap; 
-        static LLKeyframeDataMap sKeyframeDataMap;
+        typedef std::map<LLUUID, class LLKeyframeMotion::JointMotionList*> keyframe_data_map_t; 
+        static keyframe_data_map_t sKeyframeDataMap;
 
         static void addKeyframeData(const LLUUID& id, LLKeyframeMotion::JointMotionList*);
         static LLKeyframeMotion::JointMotionList* getKeyframeData(const LLUUID& id);
diff --git a/linden/indra/llcharacter/llkeyframemotionparam.cpp b/linden/indra/llcharacter/llkeyframemotionparam.cpp
index 93df410..5970909 100644
--- a/linden/indra/llcharacter/llkeyframemotionparam.cpp
+++ b/linden/indra/llcharacter/llkeyframemotionparam.cpp
@@ -4,6 +4,7 @@
  *
  * Copyright (c) 2001-2007, Linden Research, Inc.
  * 
+ * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
  * to you under the terms of the GNU General Public License, version 2.0
  * ("GPL"), unless you have obtained a separate licensing agreement
@@ -348,7 +349,7 @@ BOOL LLKeyframeMotionParam::loadMotions()
         // Load data into a buffer to be parsed.
         //-------------------------------------------------------------------------
         char path[LL_MAX_PATH];         /* Flawfinder: ignore */
-        snprintf( path,sizeof(path), "%s_%s.llp",       /* Flawfinder: ignore */
+        snprintf( path,sizeof(path), "%s_%s.llp",
                 gDirUtilp->getExpandedFilename(LL_PATH_MOTIONS,mCharacter->getAnimationPrefix()).c_str(),
                 getName().c_str() );    
 
diff --git a/linden/indra/llcharacter/llkeyframemotionparam.h b/linden/indra/llcharacter/llkeyframemotionparam.h
index 33dd094..e0885c1 100644
--- a/linden/indra/llcharacter/llkeyframemotionparam.h
+++ b/linden/indra/llcharacter/llkeyframemotionparam.h
@@ -4,6 +4,7 @@
  *
  * Copyright (c) 2002-2007, Linden Research, Inc.
  * 
+ * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
  * to you under the terms of the GNU General Public License, version 2.0
  * ("GPL"), unless you have obtained a separate licensing agreement
diff --git a/linden/indra/llcharacter/llkeyframestandmotion.cpp b/linden/indra/llcharacter/llkeyframestandmotion.cpp
index 4fcb76c..9b423c5 100644
--- a/linden/indra/llcharacter/llkeyframestandmotion.cpp
+++ b/linden/indra/llcharacter/llkeyframestandmotion.cpp
@@ -4,6 +4,7 @@
  *
  * Copyright (c) 2001-2007, Linden Research, Inc.
  * 
+ * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
  * to you under the terms of the GNU General Public License, version 2.0
  * ("GPL"), unless you have obtained a separate licensing agreement
diff --git a/linden/indra/llcharacter/llkeyframestandmotion.h b/linden/indra/llcharacter/llkeyframestandmotion.h
index f569498..e7c54c5 100644
--- a/linden/indra/llcharacter/llkeyframestandmotion.h
+++ b/linden/indra/llcharacter/llkeyframestandmotion.h
@@ -4,6 +4,7 @@
  *
  * Copyright (c) 2001-2007, Linden Research, Inc.
  * 
+ * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
  * to you under the terms of the GNU General Public License, version 2.0
  * ("GPL"), unless you have obtained a separate licensing agreement
diff --git a/linden/indra/llcharacter/llkeyframewalkmotion.cpp b/linden/indra/llcharacter/llkeyframewalkmotion.cpp
index b1838d8..bf347a6 100644
--- a/linden/indra/llcharacter/llkeyframewalkmotion.cpp
+++ b/linden/indra/llcharacter/llkeyframewalkmotion.cpp
@@ -4,6 +4,7 @@
  *
  * Copyright (c) 2001-2007, Linden Research, Inc.
  * 
+ * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
  * to you under the terms of the GNU General Public License, version 2.0
  * ("GPL"), unless you have obtained a separate licensing agreement
diff --git a/linden/indra/llcharacter/llkeyframewalkmotion.h b/linden/indra/llcharacter/llkeyframewalkmotion.h
index 3367b64..d2c9cd8 100644
--- a/linden/indra/llcharacter/llkeyframewalkmotion.h
+++ b/linden/indra/llcharacter/llkeyframewalkmotion.h
@@ -4,6 +4,7 @@
  *
  * Copyright (c) 2001-2007, Linden Research, Inc.
  * 
+ * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
  * to you under the terms of the GNU General Public License, version 2.0
  * ("GPL"), unless you have obtained a separate licensing agreement
diff --git a/linden/indra/llcharacter/llmotion.cpp b/linden/indra/llcharacter/llmotion.cpp
index d2343ab..b13ea60 100644
--- a/linden/indra/llcharacter/llmotion.cpp
+++ b/linden/indra/llcharacter/llmotion.cpp
@@ -4,6 +4,7 @@
  *
  * Copyright (c) 2001-2007, Linden Research, Inc.
  * 
+ * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
  * to you under the terms of the GNU General Public License, version 2.0
  * ("GPL"), unless you have obtained a separate licensing agreement
diff --git a/linden/indra/llcharacter/llmotion.h b/linden/indra/llcharacter/llmotion.h
index 2e302cf..48d402a 100644
--- a/linden/indra/llcharacter/llmotion.h
+++ b/linden/indra/llcharacter/llmotion.h
@@ -4,6 +4,7 @@
  *
  * Copyright (c) 2001-2007, Linden Research, Inc.
  * 
+ * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
  * to you under the terms of the GNU General Public License, version 2.0
  * ("GPL"), unless you have obtained a separate licensing agreement
diff --git a/linden/indra/llcharacter/llmotioncontroller.cpp b/linden/indra/llcharacter/llmotioncontroller.cpp
index 3e1456b..5545841 100644
--- a/linden/indra/llcharacter/llmotioncontroller.cpp
+++ b/linden/indra/llcharacter/llmotioncontroller.cpp
@@ -4,6 +4,7 @@
  *
  * Copyright (c) 2001-2007, Linden Research, Inc.
  * 
+ * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
  * to you under the terms of the GNU General Public License, version 2.0
  * ("GPL"), unless you have obtained a separate licensing agreement
@@ -180,9 +181,9 @@ LLMotionController::~LLMotionController()
 //-----------------------------------------------------------------------------
 void LLMotionController::deleteAllMotions()
 {
-        mLoadingMotions.removeAllNodes();
+        mLoadingMotions.clear();
         mLoadedMotions.clear();
-        mActiveMotions.removeAllNodes();
+        mActiveMotions.clear();
 
         for_each(mAllMotions.begin(), mAllMotions.end(), DeletePairedPointer());
         mAllMotions.clear();
@@ -234,16 +235,16 @@ void LLMotionController::setTimeStep(F32 step)
         if (step != 0.f)
         {
                 // make sure timestamps conform to new quantum
-                for(    LLMotion* motionp = mActiveMotions.getFirstData();
-                        motionp != NULL;
-                        motionp = mActiveMotions.getNextData() )
-                        {
-                                motionp->mActivationTimestamp = (F32)llfloor(motionp->mActivationTimestamp / step) * step;
-                                BOOL stopped = motionp->isStopped();
-                                motionp->setStopTime((F32)llfloor(motionp->getStopTime() / step) * step);
-                                motionp->setStopped(stopped);
-                                motionp->mSendStopTimestamp = (F32)llfloor(motionp->mSendStopTimestamp / step) * step;
-                        }
+                for (motion_list_t::iterator iter = mActiveMotions.begin();
+                         iter != mActiveMotions.end(); ++iter)
+                {
+                        LLMotion* motionp = *iter;
+                        motionp->mActivationTimestamp = (F32)llfloor(motionp->mActivationTimestamp / step) * step;
+                        BOOL stopped = motionp->isStopped();
+                        motionp->setStopTime((F32)llfloor(motionp->getStopTime() / step) * step);
+                        motionp->setStopped(stopped);
+                        motionp->mSendStopTimestamp = (F32)llfloor(motionp->mSendStopTimestamp / step) * step;
+                }
         }
 }
 
@@ -257,23 +258,6 @@ void LLMotionController::setTimeFactor(F32 time_factor)
 }
 
 //-----------------------------------------------------------------------------
-// getFirstActiveMotion()
-//-----------------------------------------------------------------------------
-LLMotion* LLMotionController::getFirstActiveMotion() 
-{ 
-        return mActiveMotions.getFirstData();
-}
-
-//-----------------------------------------------------------------------------
-// getNextActiveMotion()
-//-----------------------------------------------------------------------------
-LLMotion* LLMotionController::getNextActiveMotion()
-{ 
-        return mActiveMotions.getNextData();
-}
-
-
-//-----------------------------------------------------------------------------
 // setCharacter()
 //-----------------------------------------------------------------------------
 void LLMotionController::setCharacter(LLCharacter *character)
@@ -300,17 +284,9 @@ void LLMotionController::removeMotion( const LLUUID& id)
         {
                 stopMotionLocally(id, TRUE);
 
-                mLoadingMotions.deleteData(motionp);
-                std::deque<LLMotion*>::iterator motion_it;
-                for (motion_it = mLoadedMotions.begin(); motion_it != mLoadedMotions.end(); ++motion_it)
-                {
-                        if(*motion_it == motionp)
-                        {
-                                mLoadedMotions.erase(motion_it);
-                                break;
-                        }
-                }
-                mActiveMotions.deleteData(motionp);
+                mLoadingMotions.erase(motionp);
+                mLoadedMotions.remove(motionp);
+                mActiveMotions.remove(motionp);
                 mAllMotions.erase(id);
                 delete motionp;
         }
@@ -351,7 +327,7 @@ LLMotion* LLMotionController::createMotion( const LLUUID &id )
                         delete motion;
                         return NULL;
                 case LLMotion::STATUS_HOLD:
-                        mLoadingMotions.addData(motion);
+                        mLoadingMotions.insert(motion);
                         break;
                 case LLMotion::STATUS_SUCCESS:
                         // add motion to our list
@@ -470,10 +446,11 @@ void LLMotionController::updateMotionsByType(LLMotion::LLMotionBlendType anim_ty
         memset(&last_joint_signature, 0, sizeof(U8) * LL_CHARACTER_MAX_JOINTS);
 
         // iterate through active motions in chronological order
-        for(LLMotion* motionp = mActiveMotions.getFirstData();
-                motionp != NULL;
-                motionp = mActiveMotions.getNextData())
+        for (motion_list_t::iterator iter = mActiveMotions.begin();
+                 iter != mActiveMotions.end(); )
         {
+                motion_list_t::iterator curiter = iter++;
+                LLMotion* motionp = *curiter;
                 if (motionp->getBlendType() != anim_type)
                 {
                         continue;
@@ -487,9 +464,8 @@ void LLMotionController::updateMotionsByType(LLMotion::LLMotionBlendType anim_ty
                 }
                 else
                 {
-                        S32 i;
                         // NUM_JOINT_SIGNATURE_STRIDES should be multiple of 4
-                        for (i = 0; i < NUM_JOINT_SIGNATURE_STRIDES; i++)
+                        for (S32 i = 0; i < NUM_JOINT_SIGNATURE_STRIDES; i++)
                         {
                                 U32 *current_signature = (U32*)&(mJointSignature[0][i * 4]);
                                 U32 test_signature = *(U32*)&(motionp->mJointSignature[0][i * 4]);
@@ -745,16 +721,15 @@ void LLMotionController::updateMotion()
         }
 
         // query pending motions for completion
-        LLMotion* motionp;
-
-        for (   motionp = mLoadingMotions.getFirstData();
-                        motionp != NULL;
-                        motionp = mLoadingMotions.getNextData() )
+        for (motion_set_t::iterator iter = mLoadingMotions.begin();
+                 iter != mLoadingMotions.end(); )
         {
+                motion_set_t::iterator curiter = iter++;
+                LLMotion* motionp = *curiter;
                 LLMotion::LLMotionInitStatus status = motionp->onInitialize(mCharacter);
                 if (status == LLMotion::STATUS_SUCCESS)
                 {
-                        mLoadingMotions.removeCurrentData();
+                        mLoadingMotions.erase(curiter);
                         // add motion to our loaded motion list
                         addLoadedMotion(motionp);
                         // this motion should be playing
@@ -767,7 +742,7 @@ void LLMotionController::updateMotion()
                 {
                         llinfos << "Motion " << motionp->getID() << " init failed." << llendl;
                         sRegistry.markBad(motionp->getID());
-                        mLoadingMotions.removeCurrentData();
+                        mLoadingMotions.erase(curiter);
                         mAllMotions.erase(motionp->getID());
                         delete motionp;
                 }
@@ -804,7 +779,7 @@ void LLMotionController::updateMotion()
 //-----------------------------------------------------------------------------
 BOOL LLMotionController::activateMotion(LLMotion *motion, F32 time)
 {
-        if (mLoadingMotions.checkData(motion))
+        if (mLoadingMotions.find(motion) != mLoadingMotions.end())
         {
                 // we want to start this motion, but we can't yet, so flag it as started
                 motion->setStopped(FALSE);
@@ -835,7 +810,8 @@ BOOL LLMotionController::activateMotion(LLMotion *motion, F32 time)
                 motion->mSendStopTimestamp = F32_MAX;
         }
 
-        mActiveMotions.addData(motion);
+        mActiveMotions.remove(motion); // in case it is already in the active list
+        mActiveMotions.push_front(motion);
 
         motion->activate();
         motion->onUpdate(0.f, mJointSignature[1]);
@@ -849,7 +825,7 @@ BOOL LLMotionController::activateMotion(LLMotion *motion, F32 time)
 BOOL LLMotionController::deactivateMotion(LLMotion *motion)
 {
         motion->deactivate();
-        mActiveMotions.removeData(motion);
+        mActiveMotions.remove(motion);
 
         return TRUE;
 }
@@ -857,22 +833,17 @@ BOOL LLMotionController::deactivateMotion(LLMotion *motion)
 //-----------------------------------------------------------------------------
 // isMotionActive()
 //-----------------------------------------------------------------------------
-BOOL LLMotionController::isMotionActive(LLMotion *motion)
+bool LLMotionController::isMotionActive(LLMotion *motion)
 {
-        if (motion && motion->isActive())
-        {
-                return TRUE;
-        }
-
-        return FALSE;
+        return (motion && motion->isActive());
 }
 
 //-----------------------------------------------------------------------------
 // isMotionLoading()
 //-----------------------------------------------------------------------------
-BOOL LLMotionController::isMotionLoading(LLMotion* motion)
+bool LLMotionController::isMotionLoading(LLMotion* motion)
 {
-        return mLoadingMotions.checkData(motion);
+        return (mLoadingMotions.find(motion) != mLoadingMotions.end());
 }
 
 
@@ -890,15 +861,15 @@ LLMotion *LLMotionController::findMotion(const LLUUID& id)
 //-----------------------------------------------------------------------------
 void LLMotionController::flushAllMotions()
 {
-        LLDynamicArray<LLUUID> active_motions;
-        LLDynamicArray<F32> active_motion_times;
-
-        for (LLMotion* motionp = mActiveMotions.getFirstData();
-                motionp;
-                motionp = mActiveMotions.getNextData())
+        std::vector<std::pair<LLUUID,F32> > active_motions;
+        active_motions.reserve(mActiveMotions.size());
+        for (motion_list_t::iterator iter = mActiveMotions.begin();
+                 iter != mActiveMotions.end(); )
         {
-                active_motions.put(motionp->getID());
-                active_motion_times.put(mTime - motionp->mActivationTimestamp);
+                motion_list_t::iterator curiter = iter++;
+                LLMotion* motionp = *curiter;
+                F32 dtime = mTime - motionp->mActivationTimestamp;
+                active_motions.push_back(std::make_pair(motionp->getID(),dtime));
                 motionp->deactivate();
         }
 
@@ -910,9 +881,10 @@ void LLMotionController::flushAllMotions()
         mCharacter->removeAnimationData("Hand Pose");
 
         // restart motions
-        for (S32 i = 0; i < active_motions.count(); i++)
+        for (std::vector<std::pair<LLUUID,F32> >::iterator iter = active_motions.begin();
+                 iter != active_motions.end(); ++iter)
         {
-                startMotion(active_motions[i], active_motion_times[i]);
+                startMotion(iter->first, iter->second);
         }
 }
 
diff --git a/linden/indra/llcharacter/llmotioncontroller.h b/linden/indra/llcharacter/llmotioncontroller.h
index c9ee7c4..e4c7b3f 100644
--- a/linden/indra/llcharacter/llmotioncontroller.h
+++ b/linden/indra/llcharacter/llmotioncontroller.h
@@ -4,6 +4,7 @@
  *
  * Copyright (c) 2001-2007, Linden Research, Inc.
  * 
+ * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
  * to you under the terms of the GNU General Public License, version 2.0
  * ("GPL"), unless you have obtained a separate licensing agreement
@@ -35,7 +36,6 @@
 #include <map>
 #include <deque>
 
-#include "linked_lists.h"
 #include "lluuidhashmap.h"
 #include "llmotion.h"
 #include "llpose.h"
@@ -109,6 +109,10 @@ protected:
 class LLMotionController
 {
 public:
+        typedef std::list<LLMotion*> motion_list_t;
+        typedef std::set<LLMotion*> motion_set_t;
+        
+public:
         // Constructor
         LLMotionController();
 
@@ -164,12 +168,11 @@ public:
         void setTimeFactor(F32 time_factor);
         F32 getTimeFactor() { return mTimeFactor; }
 
-        LLMotion* getFirstActiveMotion();
-        LLMotion* getNextActiveMotion();
+        motion_list_t& getActiveMotions() { return mActiveMotions; }
 
 //protected:
-        BOOL isMotionActive( LLMotion *motion );
-        BOOL isMotionLoading( LLMotion *motion );
+        bool isMotionActive( LLMotion *motion );
+        bool isMotionLoading( LLMotion *motion );
         LLMotion *findMotion( const LLUUID& id );
 
 protected:
@@ -199,9 +202,9 @@ protected:
 
         std::map<LLUUID, LLMotion*>     mAllMotions;
 
-        LLLinkedList<LLMotion>          mLoadingMotions;
-        std::deque<LLMotion*>           mLoadedMotions;
-        LLLinkedList<LLMotion>          mActiveMotions;
+        motion_set_t            mLoadingMotions;
+        motion_list_t           mLoadedMotions;
+        motion_list_t           mActiveMotions;
         
         LLFrameTimer            mTimer;
         F32                                     mTime;
diff --git a/linden/indra/llcharacter/llmultigesture.cpp b/linden/indra/llcharacter/llmultigesture.cpp
index 80cbacb..0a4d99a 100644
--- a/linden/indra/llcharacter/llmultigesture.cpp
+++ b/linden/indra/llcharacter/llmultigesture.cpp
@@ -4,6 +4,7 @@
  *
  * Copyright (c) 2004-2007, Linden Research, Inc.
  * 
+ * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
  * to you under the terms of the GNU General Public License, version 2.0
  * ("GPL"), unless you have obtained a separate licensing agreement
@@ -469,7 +470,7 @@ std::string LLGestureStepWait::getLabel() const
         if (mFlags & WAIT_FLAG_TIME)
         {
                 char buffer[64];                /* Flawfinder: ignore */
-                snprintf(buffer, sizeof(buffer), "%.1f seconds", (double)mWaitSeconds);         /* Flawfinder: ignore */
+                snprintf(buffer, sizeof(buffer), "%.1f seconds", (double)mWaitSeconds); /* Flawfinder: ignore */
                 label += buffer;
         }
         else if (mFlags & WAIT_FLAG_ALL_ANIM)
diff --git a/linden/indra/llcharacter/llmultigesture.h b/linden/indra/llcharacter/llmultigesture.h
index aeb7c04..75e5db8 100644
--- a/linden/indra/llcharacter/llmultigesture.h
+++ b/linden/indra/llcharacter/llmultigesture.h
@@ -4,6 +4,7 @@
  *
  * Copyright (c) 2004-2007, Linden Research, Inc.
  * 
+ * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
  * to you under the terms of the GNU General Public License, version 2.0
  * ("GPL"), unless you have obtained a separate licensing agreement
diff --git a/linden/indra/llcharacter/llpose.cpp b/linden/indra/llcharacter/llpose.cpp
index ebf6a67..ccedc1e 100644
--- a/linden/indra/llcharacter/llpose.cpp
+++ b/linden/indra/llcharacter/llpose.cpp
@@ -4,6 +4,7 @@
  *
  * Copyright (c) 2001-2007, Linden Research, Inc.
  * 
+ * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
  * to you under the terms of the GNU General Public License, version 2.0
  * ("GPL"), unless you have obtained a separate licensing agreement
@@ -34,6 +35,7 @@
 
 #include "llmotion.h"
 #include "llmath.h"
+#include "llstl.h"
 
 //-----------------------------------------------------------------------------
 // Static
@@ -457,7 +459,7 @@ LLPoseBlender::LLPoseBlender()
 
 LLPoseBlender::~LLPoseBlender()
 {
-        mJointStateBlenderPool.deleteAllData();
+        for_each(mJointStateBlenderPool.begin(), mJointStateBlenderPool.end(), DeletePairedPointer());
 }
 
 //-----------------------------------------------------------------------------
@@ -471,15 +473,16 @@ BOOL LLPoseBlender::addMotion(LLMotion* motion)
         {
                 LLJoint *jointp = jsp->getJoint();
                 LLJointStateBlender* joint_blender;
-                if (!mJointStateBlenderPool.checkData(jointp))
+                if (mJointStateBlenderPool.find(jointp) == mJointStateBlenderPool.end())
                 {
                         // this is the first time we are animating this joint
                         // so create new jointblender and add it to our pool
                         joint_blender = new LLJointStateBlender();
-                        mJointStateBlenderPool.addData(jointp, joint_blender);
-                } else
+                        mJointStateBlenderPool[jointp] = joint_blender;
+                }
+                else
                 {
-                        joint_blender = mJointStateBlenderPool.getData(jointp);
+                        joint_blender = mJointStateBlenderPool[jointp];
                 }
 
                 if (jsp->getPriority() == LLJoint::USE_MOTION_PRIORITY)
@@ -492,9 +495,9 @@ BOOL LLPoseBlender::addMotion(LLMotion* motion)
                 }
 
                 // add it to our list of active blenders
-                if(!mActiveBlenders.checkData(joint_blender))
+                if (std::find(mActiveBlenders.begin(), mActiveBlenders.end(), joint_blender) == mActiveBlenders.end())
                 {
-                        mActiveBlenders.addData(joint_blender);
+                        mActiveBlenders.push_front(joint_blender);
                 }
         }
         return TRUE;
@@ -505,15 +508,15 @@ BOOL LLPoseBlender::addMotion(LLMotion* motion)
 //-----------------------------------------------------------------------------
 void LLPoseBlender::blendAndApply()
 {
-        for (LLJointStateBlender* jsbp = mActiveBlenders.getFirstData(); 
-                jsbp;
-                jsbp = mActiveBlenders.getNextData())
+        for (blender_list_t::iterator iter = mActiveBlenders.begin();
+                 iter != mActiveBlenders.end(); ++iter)
         {
+                LLJointStateBlender* jsbp = *iter;
                 jsbp->blendJointStates();
         }
 
         // we're done now so there are no more active blenders for this frame
-        mActiveBlenders.removeAllNodes();
+        mActiveBlenders.clear();
 }
 
 //-----------------------------------------------------------------------------
@@ -521,10 +524,10 @@ void LLPoseBlender::blendAndApply()
 //-----------------------------------------------------------------------------
 void LLPoseBlender::blendAndCache(BOOL reset_cached_joints)
 {
-        for (LLJointStateBlender* jsbp = mActiveBlenders.getFirstData();
-                jsbp;
-                jsbp = mActiveBlenders.getNextData())
+        for (blender_list_t::iterator iter = mActiveBlenders.begin();
+                 iter != mActiveBlenders.end(); ++iter)
         {
+                LLJointStateBlender* jsbp = *iter;
                 if (reset_cached_joints)
                 {
                         jsbp->resetCachedJoint();
@@ -538,10 +541,10 @@ void LLPoseBlender::blendAndCache(BOOL reset_cached_joints)
 //-----------------------------------------------------------------------------
 void LLPoseBlender::interpolate(F32 u)
 {
-        for (LLJointStateBlender* jsbp = mActiveBlenders.getFirstData();
-                jsbp;
-                jsbp = mActiveBlenders.getNextData())
+        for (blender_list_t::iterator iter = mActiveBlenders.begin();
+                 iter != mActiveBlenders.end(); ++iter)
         {
+                LLJointStateBlender* jsbp = *iter;
                 jsbp->interpolate(u);
         }
 }
@@ -551,13 +554,13 @@ void LLPoseBlender::interpolate(F32 u)
 //-----------------------------------------------------------------------------
 void LLPoseBlender::clearBlenders()
 {
-        for (LLJointStateBlender* jsbp = mActiveBlenders.getFirstData();
-                jsbp;
-                jsbp = mActiveBlenders.getNextData())
+        for (blender_list_t::iterator iter = mActiveBlenders.begin();
+                 iter != mActiveBlenders.end(); ++iter)
         {
+                LLJointStateBlender* jsbp = *iter;
                 jsbp->clear();
         }
 
-        mActiveBlenders.removeAllNodes();
+        mActiveBlenders.clear();
 }
 
diff --git a/linden/indra/llcharacter/llpose.h b/linden/indra/llcharacter/llpose.h
index 12d1640..f57f7de 100644
--- a/linden/indra/llcharacter/llpose.h
+++ b/linden/indra/llcharacter/llpose.h
@@ -4,6 +4,7 @@
  *
  * Copyright (c) 2001-2007, Linden Research, Inc.
  * 
+ * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
  * to you under the terms of the GNU General Public License, version 2.0
  * ("GPL"), unless you have obtained a separate licensing agreement
@@ -106,8 +107,10 @@ class LLMotion;
 class LLPoseBlender
 {
 protected:
-        LLMap<LLJoint*,LLJointStateBlender*> mJointStateBlenderPool;
-        LLLinkedList<LLJointStateBlender> mActiveBlenders;
+        typedef std::list<LLJointStateBlender*> blender_list_t;
+        typedef std::map<LLJoint*,LLJointStateBlender*> blender_map_t;
+        blender_map_t mJointStateBlenderPool;
+        blender_list_t mActiveBlenders;
 
         S32                     mNextPoseSlot;
         LLPose          mBlendedPose;
diff --git a/linden/indra/llcharacter/llstatemachine.cpp b/linden/indra/llcharacter/llstatemachine.cpp
index 6920bcf..1ad81be 100644
--- a/linden/indra/llcharacter/llstatemachine.cpp
+++ b/linden/indra/llcharacter/llstatemachine.cpp
@@ -4,6 +4,7 @@
  *
  * Copyright (c) 2001-2007, Linden Research, Inc.
  * 
+ * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
  * to you under the terms of the GNU General Public License, version 2.0
  * ("GPL"), unless you have obtained a separate licensing agreement
diff --git a/linden/indra/llcharacter/llstatemachine.h b/linden/indra/llcharacter/llstatemachine.h
index 0f986bd..091662e 100644
--- a/linden/indra/llcharacter/llstatemachine.h
+++ b/linden/indra/llcharacter/llstatemachine.h
@@ -4,6 +4,7 @@
  *
  * Copyright (c) 2001-2007, Linden Research, Inc.
  * 
+ * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
  * to you under the terms of the GNU General Public License, version 2.0
  * ("GPL"), unless you have obtained a separate licensing agreement
diff --git a/linden/indra/llcharacter/lltargetingmotion.cpp b/linden/indra/llcharacter/lltargetingmotion.cpp
index 799e4d0..9e8b8df 100644
--- a/linden/indra/llcharacter/lltargetingmotion.cpp
+++ b/linden/indra/llcharacter/lltargetingmotion.cpp
@@ -4,6 +4,7 @@
  *
  * Copyright (c) 2001-2007, Linden Research, Inc.
  * 
+ * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
  * to you under the terms of the GNU General Public License, version 2.0
  * ("GPL"), unless you have obtained a separate licensing agreement
diff --git a/linden/indra/llcharacter/lltargetingmotion.h b/linden/indra/llcharacter/lltargetingmotion.h
index 9fd8391..a6a6b03 100644
--- a/linden/indra/llcharacter/lltargetingmotion.h
+++ b/linden/indra/llcharacter/lltargetingmotion.h
@@ -4,6 +4,7 @@
  *
  * Copyright (c) 2002-2007, Linden Research, Inc.
  * 
+ * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
  * to you under the terms of the GNU General Public License, version 2.0
  * ("GPL"), unless you have obtained a separate licensing agreement
diff --git a/linden/indra/llcharacter/llvisualparam.cpp b/linden/indra/llcharacter/llvisualparam.cpp
index ed8a034..de163eb 100644
--- a/linden/indra/llcharacter/llvisualparam.cpp
+++ b/linden/indra/llcharacter/llvisualparam.cpp
@@ -4,6 +4,7 @@
  *
  * Copyright (c) 2001-2007, Linden Research, Inc.
  * 
+ * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
  * to you under the terms of the GNU General Public License, version 2.0
  * ("GPL"), unless you have obtained a separate licensing agreement
diff --git a/linden/indra/llcharacter/llvisualparam.h b/linden/indra/llcharacter/llvisualparam.h
index 74774b8..ec19fa0 100644
--- a/linden/indra/llcharacter/llvisualparam.h
+++ b/linden/indra/llcharacter/llvisualparam.h
@@ -4,6 +4,7 @@
  *
  * Copyright (c) 2001-2007, Linden Research, Inc.
  * 
+ * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
  * to you under the terms of the GNU General Public License, version 2.0
  * ("GPL"), unless you have obtained a separate licensing agreement