diff options
| author | Graham Madarasz (Graham Linden) <graham@lindenlab.com> | 2013-03-14 14:12:26 -0700 |
|---|---|---|
| committer | Graham Madarasz (Graham Linden) <graham@lindenlab.com> | 2013-03-14 14:12:26 -0700 |
| commit | e8dfa28697c177e8ed08ff76a9b81f920805a92f (patch) | |
| tree | acaba1a018f151837292f12388a2945860be8fbd /indra/llcharacter/llmotion.cpp | |
| parent | 2a8ec731c93bb3c119cea166057a027aa37e383b (diff) | |
Rollback Maestro interp changes
Diffstat (limited to 'indra/llcharacter/llmotion.cpp')
| -rw-r--r-- | indra/llcharacter/llmotion.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/llcharacter/llmotion.cpp b/indra/llcharacter/llmotion.cpp index d4db0d84c9..a07f9f4d2e 100644 --- a/indra/llcharacter/llmotion.cpp +++ b/indra/llcharacter/llmotion.cpp @@ -73,7 +73,7 @@ void LLMotion::fadeOut() { if (mFadeWeight > 0.01f) { - mFadeWeight = lerp(mFadeWeight, 0.f, LLCriticalDamp::getInterpolant(InterpDeltaFadeWeight)); + mFadeWeight = lerp(mFadeWeight, 0.f, LLCriticalDamp::getInterpolant(0.15f)); } else { @@ -88,7 +88,7 @@ void LLMotion::fadeIn() { if (mFadeWeight < 0.99f) { - mFadeWeight = lerp(mFadeWeight, 1.f, LLCriticalDamp::getInterpolant(InterpDeltaFadeWeight)); + mFadeWeight = lerp(mFadeWeight, 1.f, LLCriticalDamp::getInterpolant(0.15f)); } else { |