diff options
| author | Richard Linden <none@none> | 2013-06-28 20:45:20 -0700 |
|---|---|---|
| committer | Richard Linden <none@none> | 2013-06-28 20:45:20 -0700 |
| commit | ffa7123bb5187e1da491a8f475d696053d9c9ee4 (patch) | |
| tree | c93505d62775737dd087695ced75f6c4d8f10d6a /indra/llcharacter | |
| parent | 0f178ec33debc6d92f3b2aa2392e640eb342a095 (diff) | |
SH-4299 FIX Interesting: High fps shown temporarily off scale in statistics console
added ability to force uniqueness of LLCopyOnWritePointer
converted more variables to units
added convenience function for unit constants
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 c6ca0b542e..b627110da6 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, LLUnit<F32, LLUnits::Milliseconds>(100)); + mRoll = LLSmoothInterpolation::lerp(mRoll, target_roll, LLUnits::Milliseconds::fromValue(100)); LLQuaternion roll(mRoll, LLVector3(0.f, 0.f, 1.f)); mPelvisState->setRotation(roll); |