diff options
| author | Richard Linden <none@none> | 2013-06-13 15:29:15 -0700 |
|---|---|---|
| committer | Richard Linden <none@none> | 2013-06-13 15:29:15 -0700 |
| commit | 9fd3af3c389ed491b515cbb5136b344b069913e4 (patch) | |
| tree | 79575b5483f940a57cbac168f175d03bce3eb969 /indra/llcharacter/llkeyframewalkmotion.cpp | |
| parent | ebf35d51b14f224c36a19a453a20885e667f6bec (diff) | |
SH-3931 WIP Interesting: Add graphs to visualize scene load metrics
changed Units macros and argument order to make it more clear
optimized units for integer types
fixed merging of periodicrecordings...should eliminate duplicate entries in sceneloadmonitor history
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 e188b06c03..c6ca0b542e 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<LLUnits::Milliseconds, F32>(100)); + mRoll = LLSmoothInterpolation::lerp(mRoll, target_roll, LLUnit<F32, LLUnits::Milliseconds>(100)); LLQuaternion roll(mRoll, LLVector3(0.f, 0.f, 1.f)); mPelvisState->setRotation(roll); |