1 files changed, 9 insertions, 6 deletions

diff --git a/linden/indra/llcharacter/llkeyframemotionparam.h b/linden/indra/llcharacter/llkeyframemotionparam.h
index f509e6a..0d17141 100644
--- a/linden/indra/llcharacter/llkeyframemotionparam.h
+++ b/linden/indra/llcharacter/llkeyframemotionparam.h
@@ -126,7 +126,12 @@ protected:
         //-------------------------------------------------------------------------
         // new functions defined by this subclass
         //-------------------------------------------------------------------------
-        typedef std::pair<LLMotion*, F32> ParameterizedMotion;
+        struct ParameterizedMotion
+        {
+                ParameterizedMotion(LLMotion* motion, F32 param) : mMotion(motion), mParam(param) {}
+                LLMotion* mMotion;
+                F32 mParam;
+        };
         
         // add a motion and associated parameter triplet
         BOOL addKeyframeMotion(char *name, const LLUUID &id, char *param, F32 value);
@@ -134,8 +139,6 @@ protected:
         // set default motion for LOD and retrieving blend constants
         void setDefaultKeyframeMotion(char *);
 
-        static BOOL sortFunc(ParameterizedMotion *new_motion, ParameterizedMotion *tested_motion);
-
         BOOL loadMotions();
 
 protected:
@@ -147,10 +150,10 @@ protected:
         {
                 bool operator() (const ParameterizedMotion& a, const ParameterizedMotion& b) const
                 {
-                        if (a.second != b.second)
-                                return (a.second < b.second);
+                        if (a.mParam != b.mParam)
+                                return (a.mParam < b.mParam);
                         else
-                                return a.first < b.first;
+                                return a.mMotion < b.mMotion;
                 }
         };