diff options
| author | Richard Linden <none@none> | 2013-08-14 11:51:49 -0700 |
|---|---|---|
| committer | Richard Linden <none@none> | 2013-08-14 11:51:49 -0700 |
| commit | 26581404e426b00cd0a07c38b5cb858d5d5faa28 (patch) | |
| tree | f2a9a512fac56b7ce4f5f643617346e05c0a2992 /indra/llcharacter/llkeyframewalkmotion.cpp | |
| parent | 9faaa28f4445425e8c5b7b002faffbe0365b905d (diff) | |
BUILDFIX: added header for numeric_limits support on gcc
added convenience types for units F32Seconds, etc.
Diffstat (limited to 'indra/llcharacter/llkeyframewalkmotion.cpp')
| -rwxr-xr-x | 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 8c9477f80d..66e4b947c4 100755 --- 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 = LLSmoothInterpolation::lerp(mRoll, target_roll, LLUnits::Milliseconds::fromValue(100)); + mRoll = LLSmoothInterpolation::lerp(mRoll, target_roll, LLUnits::U32Milliseconds(100)); LLQuaternion roll(mRoll, LLVector3(0.f, 0.f, 1.f)); mPelvisState->setRotation(roll); |