diff options
| author | Steven Bennetts <steve@lindenlab.com> | 2008-06-27 21:02:01 +0000 |
|---|---|---|
| committer | Steven Bennetts <steve@lindenlab.com> | 2008-06-27 21:02:01 +0000 |
| commit | 926ea0b39afd04cab469ca17b28f95ebf969e669 (patch) | |
| tree | 40d5653e19160f72e7a0b80fadb9bdb93ef3575c /indra/llcharacter/llkeyframemotionparam.h | |
| parent | 41877d457ab9542dca22b99f3eddb1bfcfe7c1d6 (diff) | |
QAR-669 1.20 Viewer RC11
QAR-648 1.20 Viewer RC10
merge Branch_1-20-Viewer-2 -r 88724:90511 -> release
Diffstat (limited to 'indra/llcharacter/llkeyframemotionparam.h')
| -rw-r--r-- | indra/llcharacter/llkeyframemotionparam.h | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/indra/llcharacter/llkeyframemotionparam.h b/indra/llcharacter/llkeyframemotionparam.h index 305207eb09..c8104d2b38 100644 --- a/indra/llcharacter/llkeyframemotionparam.h +++ b/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; } }; |