diff options
| author | Richard Linden <none@none> | 2013-08-15 00:02:23 -0700 |
|---|---|---|
| committer | Richard Linden <none@none> | 2013-08-15 00:02:23 -0700 |
| commit | 9f7bfa1c3710856cd2b0a0a8a429d6c45b0fcd09 (patch) | |
| tree | abc27a8ff7406b2216a13ba3804b006e60f1f080 /indra/llcharacter | |
| parent | 01c1d40b3faa139e9aeacbea7acae3ab65ca9dcd (diff) | |
moved unit types out of LLUnits namespace, since they are prefixed
Diffstat (limited to 'indra/llcharacter')
| -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 66e4b947c4..65c1fcd99d 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::U32Milliseconds(100)); + mRoll = LLSmoothInterpolation::lerp(mRoll, target_roll, U32Milliseconds(100)); LLQuaternion roll(mRoll, LLVector3(0.f, 0.f, 1.f)); mPelvisState->setRotation(roll); |