diff options
| author | Richard Linden <none@none> | 2013-05-20 19:28:20 -0700 |
|---|---|---|
| committer | Richard Linden <none@none> | 2013-05-20 19:28:20 -0700 |
| commit | 11cee0c140af90564f5616d3464f29abae4d585f (patch) | |
| tree | 16c6faf318d805aaaceb7c196d91170e92564b77 /indra/newview/llscenemonitor.cpp | |
| parent | 13f43fdc5bd046f7857f06254c84b8993bdcc50a (diff) | |
| parent | ab5106535758393e02b075d1e404e4e1fcf81abf (diff) | |
Automated merge with ssh://hg.lindenlab.com/richard/viewer-interesting
Diffstat (limited to 'indra/newview/llscenemonitor.cpp')
| -rw-r--r-- | indra/newview/llscenemonitor.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/indra/newview/llscenemonitor.cpp b/indra/newview/llscenemonitor.cpp index b7517a057e..b303dfbdb4 100644 --- a/indra/newview/llscenemonitor.cpp +++ b/indra/newview/llscenemonitor.cpp @@ -270,10 +270,12 @@ void LLSceneMonitor::capture() static LLFrameTimer timer; LLTrace::Recording& last_frame_recording = LLTrace::get_frame_recording().getLastRecording(); - if (last_frame_recording.getSum(*LLViewerCamera::getVelocityStat()) > 0.001f - || last_frame_recording.getSum(*LLViewerCamera::getAngularVelocityStat()) > 0.01f) + if (mEnabled + && (last_frame_recording.getSum(*LLViewerCamera::getVelocityStat()) > 0.001f + || last_frame_recording.getSum(*LLViewerCamera::getAngularVelocityStat()) > 0.01f)) { reset(); + freezeScene(); } bool enabled = monitor_enabled || mDebugViewerVisible; |