diff options
| author | Oz Linden <oz@lindenlab.com> | 2016-12-05 15:20:27 -0500 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2016-12-05 15:20:27 -0500 |
| commit | c21571474c0022f83a4efc28d59e97fc020fd0e7 (patch) | |
| tree | 15586cbd2055a1c84dad4ce2f74efe1a885d997d /indra/llcharacter/llmotion.h | |
| parent | fd2ccb16068dfd21307b17e78e384d8ae19fef12 (diff) | |
| parent | 68413474c4479eee9bdbeb34ea131475ba1d646e (diff) | |
merge changes for 5.0.0-release
Diffstat (limited to 'indra/llcharacter/llmotion.h')
| -rw-r--r-- | indra/llcharacter/llmotion.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/llcharacter/llmotion.h b/indra/llcharacter/llmotion.h index 5e37f094b8..2dfc3afc7f 100644 --- a/indra/llcharacter/llmotion.h +++ b/indra/llcharacter/llmotion.h @@ -181,7 +181,7 @@ protected: F32 mSendStopTimestamp; // time when simulator should be told to stop this motion F32 mResidualWeight; // blend weight at beginning of stop motion phase F32 mFadeWeight; // for fading in and out based on LOD - U8 mJointSignature[3][LL_CHARACTER_MAX_JOINTS]; // signature of which joints are animated at what priority + U8 mJointSignature[3][LL_CHARACTER_MAX_ANIMATED_JOINTS]; // signature of which joints are animated at what priority void (*mDeactivateCallback)(void* data); void* mDeactivateCallbackUserData; }; |