diff options
| author | Richard Linden <none@none> | 2012-11-01 00:32:45 -0700 |
|---|---|---|
| committer | Richard Linden <none@none> | 2012-11-01 00:32:45 -0700 |
| commit | 3ccbce90e37b92d5b32a2507804adc91bc58065d (patch) | |
| tree | 519ae7f820bc8adde6617736c9d35c82c152705b /indra/newview/llagentcamera.cpp | |
| parent | b71e991c1860bbea0387f9434cc2b4b31a26469a (diff) | |
| parent | 819adb5eb4d7f982121f3dbd82750e05d26864d9 (diff) | |
Automated merge with ssh://hg.lindenlab.com/richard/viewer-interesting-metrics
Diffstat (limited to 'indra/newview/llagentcamera.cpp')
| -rw-r--r-- | indra/newview/llagentcamera.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/llagentcamera.cpp b/indra/newview/llagentcamera.cpp index 751b73e1eb..8d80e3aa0a 100644 --- a/indra/newview/llagentcamera.cpp +++ b/indra/newview/llagentcamera.cpp @@ -1081,8 +1081,8 @@ void LLAgentCamera::updateLookAt(const S32 mouse_x, const S32 mouse_y) LLQuaternion av_inv_rot = ~gAgentAvatarp->mRoot.getWorldRotation(); LLVector3 root_at = LLVector3::x_axis * gAgentAvatarp->mRoot.getWorldRotation(); - if ((gViewerWindow->getMouseVelocityStat()->getCurrent() < 0.01f) && - (root_at * last_at_axis > 0.95f)) + if (LLTrace::get_frame_recording().getLastRecordingPeriod().getLastValue(*gViewerWindow->getMouseVelocityStat()) < 0.01f + && (root_at * last_at_axis > 0.95f)) { LLVector3 vel = gAgentAvatarp->getVelocity(); if (vel.magVecSquared() > 4.f) |