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/llviewercamera.cpp | |
parent | c05fa390dc57b072da4b69b4e08743fd62bf4ce5 (diff) | |
parent | 2436bd9487ac62899ed01859bdd4c0871020d4f7 (diff) |
Automated merge with ssh://hg.lindenlab.com/richard/viewer-interesting
Diffstat (limited to 'indra/newview/llviewercamera.cpp')
-rw-r--r-- | indra/newview/llviewercamera.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llviewercamera.cpp b/indra/newview/llviewercamera.cpp index 9ca5f07f35..1f5bdc8589 100644 --- a/indra/newview/llviewercamera.cpp +++ b/indra/newview/llviewercamera.cpp @@ -170,7 +170,7 @@ void LLViewerCamera::updateCameraLocation(const LLVector3 ¢er, add(sVelocityStat, dpos); add(sAngularVelocityStat, drot); - mAverageSpeed = LLTrace::get_frame_recording().getPeriodMeanPerSec(sVelocityStat); + mAverageSpeed = LLTrace::get_frame_recording().getPeriodMeanPerSec(sVelocityStat, 50); mAverageAngularSpeed = LLTrace::get_frame_recording().getPeriodMeanPerSec(sAngularVelocityStat); mCosHalfCameraFOV = cosf(0.5f * getView() * llmax(1.0f, getAspect())); |