diff options
| author | Richard Linden <none@none> | 2013-04-11 19:18:55 -0700 |
|---|---|---|
| committer | Richard Linden <none@none> | 2013-04-11 19:18:55 -0700 |
| commit | 1459a412b9c9776daa7e6f3b5be35fe67970b3c5 (patch) | |
| tree | 7f25dd68f3d8408f6f1b37b2f9ad9d0613679daf /indra/newview/llagentcamera.cpp | |
| parent | c05fa390dc57b072da4b69b4e08743fd62bf4ce5 (diff) | |
| parent | 2436bd9487ac62899ed01859bdd4c0871020d4f7 (diff) | |
Automated merge with ssh://hg.lindenlab.com/richard/viewer-interesting
Diffstat (limited to 'indra/newview/llagentcamera.cpp')
| -rw-r--r-- | indra/newview/llagentcamera.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llagentcamera.cpp b/indra/newview/llagentcamera.cpp index 420220d21a..7c9fbccd7f 100644 --- a/indra/newview/llagentcamera.cpp +++ b/indra/newview/llagentcamera.cpp @@ -1082,7 +1082,7 @@ 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 (LLTrace::get_frame_recording().getLastRecordingPeriod().getLastValue(*gViewerWindow->getMouseVelocityStat()) < 0.01f + if (LLTrace::get_frame_recording().getLastRecording().getLastValue(*gViewerWindow->getMouseVelocityStat()) < 0.01f && (root_at * last_at_axis > 0.95f)) { LLVector3 vel = gAgentAvatarp->getVelocity(); |