diff options
| author | Graham Madarasz <graham@lindenlab.com> | 2013-03-14 06:56:23 -0700 |
|---|---|---|
| committer | Graham Madarasz <graham@lindenlab.com> | 2013-03-14 06:56:23 -0700 |
| commit | 54d8249691aea2b1bd3cd21d2569c977ff469e6f (patch) | |
| tree | 450e987b903ae05861eaec2471dee08c4a3fd92d /indra | |
| parent | 2dcc0a9907f59854d8b0d28de188d60a9a354e23 (diff) | |
Fix mismerge losing rollback change
Diffstat (limited to 'indra')
| -rw-r--r-- | indra/llcharacter/llkeyframewalkmotion.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/llcharacter/llkeyframewalkmotion.cpp b/indra/llcharacter/llkeyframewalkmotion.cpp index 8422553beb..69f064b615 100644 --- a/indra/llcharacter/llkeyframewalkmotion.cpp +++ b/indra/llcharacter/llkeyframewalkmotion.cpp @@ -383,7 +383,7 @@ BOOL LLFlyAdjustMotion::onUpdate(F32 time, U8* joint_mask) F32 target_roll = llclamp(ang_vel.mV[VZ], -4.f, 4.f) * roll_factor; // roll is critically damped interpolation between current roll and angular velocity-derived target roll - mRoll = lerp(mRoll, target_roll, LLCriticalDamp::getInterpolant(InterpDeltaSmaller)); + mRoll = lerp(mRoll, target_roll, LLCriticalDamp::getInterpolant(0.1f)); LLQuaternion roll(mRoll, LLVector3(0.f, 0.f, 1.f)); mPelvisState->setRotation(roll); |