diff options
| author | andreykproductengine <akleshchev@productengine.com> | 2016-09-01 19:11:44 +0300 |
|---|---|---|
| committer | andreykproductengine <akleshchev@productengine.com> | 2016-09-01 19:11:44 +0300 |
| commit | 9acf7f5733063ff735ad37d456e740211c191cc9 (patch) | |
| tree | 1ef11936bc567ff54f4b52cac649d2d4f2f02087 /indra/llcharacter/llpose.h | |
| parent | a00165aad438f69062c3f6e4533c1f16bf8ecf3c (diff) | |
MAINT-6221 If two animations have the same priority, it's arbitrary which one will take precedence
Diffstat (limited to 'indra/llcharacter/llpose.h')
| -rw-r--r-- | indra/llcharacter/llpose.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/indra/llcharacter/llpose.h b/indra/llcharacter/llpose.h index c004a0f3b7..28f560ed9f 100644 --- a/indra/llcharacter/llpose.h +++ b/indra/llcharacter/llpose.h @@ -85,12 +85,13 @@ class LLJointStateBlender protected: LLPointer<LLJointState> mJointStates[JSB_NUM_JOINT_STATES]; S32 mPriorities[JSB_NUM_JOINT_STATES]; + LLUUID mMoutionIds[JSB_NUM_JOINT_STATES]; BOOL mAdditiveBlends[JSB_NUM_JOINT_STATES]; public: LLJointStateBlender(); ~LLJointStateBlender(); void blendJointStates(BOOL apply_now = TRUE); - BOOL addJointState(const LLPointer<LLJointState>& joint_state, S32 priority, BOOL additive_blend); + BOOL addJointState(const LLPointer<LLJointState>& joint_state, LLUUID source_id, S32 priority, BOOL additive_blend); void interpolate(F32 u); void clear(); void resetCachedJoint(); |