diff options
| author | Richard Linden <none@none> | 2014-03-24 19:23:34 -0700 |
|---|---|---|
| committer | Richard Linden <none@none> | 2014-03-24 19:23:34 -0700 |
| commit | e5bbdafdeda0f2e6bbe97d59a24ca398b54c31eb (patch) | |
| tree | 359719c76abf090fb8cc5ae912ed013b64cb8fc7 /indra/llcharacter/llmotion.cpp | |
| parent | 31a3a3da5db077c4d9b8fe06a18de98c822db6ab (diff) | |
| parent | 5b846ed2a6dce6c5801aa74d0f36a1c7525fbcba (diff) | |
merge with release
Diffstat (limited to 'indra/llcharacter/llmotion.cpp')
| -rwxr-xr-x | indra/llcharacter/llmotion.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/indra/llcharacter/llmotion.cpp b/indra/llcharacter/llmotion.cpp index a07f9f4d2e..4803f855de 100755 --- a/indra/llcharacter/llmotion.cpp +++ b/indra/llcharacter/llmotion.cpp @@ -54,7 +54,7 @@ LLMotion::LLMotion( const LLUUID &id ) : mDeactivateCallback(NULL), mDeactivateCallbackUserData(NULL) { - for (int i=0; i<3; ++i) + for (S32 i=0; i<3; ++i) memset(&mJointSignature[i][0], 0, sizeof(U8) * LL_CHARACTER_MAX_JOINTS); } @@ -73,7 +73,7 @@ void LLMotion::fadeOut() { if (mFadeWeight > 0.01f) { - mFadeWeight = lerp(mFadeWeight, 0.f, LLCriticalDamp::getInterpolant(0.15f)); + mFadeWeight = lerp(mFadeWeight, 0.f, LLSmoothInterpolation::getInterpolant(0.15f)); } else { @@ -88,7 +88,7 @@ void LLMotion::fadeIn() { if (mFadeWeight < 0.99f) { - mFadeWeight = lerp(mFadeWeight, 1.f, LLCriticalDamp::getInterpolant(0.15f)); + mFadeWeight = lerp(mFadeWeight, 1.f, LLSmoothInterpolation::getInterpolant(0.15f)); } else { |