diff options
| author | andreykproductengine <akleshchev@productengine.com> | 2016-09-05 15:43:31 +0300 |
|---|---|---|
| committer | andreykproductengine <akleshchev@productengine.com> | 2016-09-05 15:43:31 +0300 |
| commit | ecd11724ca97a385bb04d2eb71eaf06c556791fa (patch) | |
| tree | d98b5dcbda46e3fddfe2b48320b5b311a05c45e3 /indra/llcharacter/llpose.h | |
| parent | 9e73d04811f65006198297f527d38f1c6262bdce (diff) | |
Backed out changeset: d3ffc46e9e92
Diffstat (limited to 'indra/llcharacter/llpose.h')
| -rw-r--r-- | indra/llcharacter/llpose.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/indra/llcharacter/llpose.h b/indra/llcharacter/llpose.h index 28f560ed9f..c004a0f3b7 100644 --- a/indra/llcharacter/llpose.h +++ b/indra/llcharacter/llpose.h @@ -85,13 +85,12 @@ 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, LLUUID source_id, S32 priority, BOOL additive_blend); + BOOL addJointState(const LLPointer<LLJointState>& joint_state, S32 priority, BOOL additive_blend); void interpolate(F32 u); void clear(); void resetCachedJoint(); |