1 files changed, 6 insertions, 5 deletions

diff --git a/linden/indra/llcharacter/llkeyframemotion.h b/linden/indra/llcharacter/llkeyframemotion.h
index 0ad0181..5f897cf 100644
--- a/linden/indra/llcharacter/llkeyframemotion.h
+++ b/linden/indra/llcharacter/llkeyframemotion.h
@@ -43,7 +43,6 @@
 #include "llhandmotion.h"
 #include "lljointstate.h"
 #include "llmotion.h"
-#include "llptrskipmap.h"
 #include "llquaternion.h"
 #include "v3dmath.h"
 #include "v3math.h"
@@ -158,7 +157,6 @@ public:
         U32             getFileSize();
         BOOL    serialize(LLDataPacker& dp) const;
         BOOL    deserialize(LLDataPacker& dp);
-        void    writeCAL3D(apr_file_t* fp);
         BOOL    isLoaded() { return mJointMotionList != NULL; }
 
 
@@ -339,7 +337,8 @@ public:
 
                 InterpolationType       mInterpolationType;
                 S32                                     mNumKeys;
-                LLPtrSkipMap<F32, ScaleKey*>                    mKeys;
+                typedef std::map<F32, ScaleKey> key_map_t;
+                key_map_t                       mKeys;
                 ScaleKey                        mLoopInKey;
                 ScaleKey                        mLoopOutKey;
         };
@@ -357,7 +356,8 @@ public:
 
                 InterpolationType       mInterpolationType;
                 S32                                     mNumKeys;
-                LLPtrSkipMap<F32, RotationKey*>         mKeys;
+                typedef std::map<F32, RotationKey> key_map_t;
+                key_map_t               mKeys;
                 RotationKey             mLoopInKey;
                 RotationKey             mLoopOutKey;
         };
@@ -375,7 +375,8 @@ public:
 
                 InterpolationType       mInterpolationType;
                 S32                                     mNumKeys;
-                LLPtrSkipMap<F32, PositionKey*>         mKeys;
+                typedef std::map<F32, PositionKey> key_map_t;
+                key_map_t               mKeys;
                 PositionKey             mLoopInKey;
                 PositionKey             mLoopOutKey;
         };