diff options
| author | Richard Linden <none@none> | 2013-05-10 22:24:18 -0700 |
|---|---|---|
| committer | Richard Linden <none@none> | 2013-05-10 22:24:18 -0700 |
| commit | edf731c180a61dc49255ebb25342b6256e8d6065 (patch) | |
| tree | 2d3ab9e1b7cfe09e2df0387d2a1234f13965c2fc /indra/newview | |
| parent | 3a0e45ff088278cba5314974be6539b05009b8da (diff) | |
BUILDFIX - bad logic in scene monitor frame recording
Diffstat (limited to 'indra/newview')
| -rw-r--r-- | indra/newview/llscenemonitor.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/indra/newview/llscenemonitor.cpp b/indra/newview/llscenemonitor.cpp index 5a5fd6f333..2e819c8efe 100644 --- a/indra/newview/llscenemonitor.cpp +++ b/indra/newview/llscenemonitor.cpp @@ -271,9 +271,9 @@ void LLSceneMonitor::capture() static LLCachedControl<F32> scene_load_sample_time(gSavedSettings, "SceneLoadingMonitorSampleTime"); static LLFrameTimer timer; - LLTrace::Recording* last_frame_recording = LLTrace::get_frame_recording()->getPrevRecording(); - if (last_frame_recording->getMax(LLViewerCamera::getVelocityStat()) > 0.001f - || last_frame_recording->getMax(LLViewerCamera::getAngularVelocityStat() > 0.01f) + 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) { mRecording->reset(); } @@ -296,7 +296,7 @@ void LLSceneMonitor::capture() if(timer.getElapsedTimeF32() > scene_load_sample_time() && mEnabled - && LLGLShader::sNoFixedFunction + && LLGLSLShader::sNoFixedFunction && last_capture_time != gFrameCount) { timer.reset(); @@ -595,7 +595,7 @@ void LLSceneMonitorView::draw() LLFontGL::getFontMonospace()->renderUTF8(num_str, 0, 5, getRect().getHeight() - line_height * lines, color, LLFontGL::LEFT, LLFontGL::TOP); lines++; - num_str = llformat("Sampling time: %.3f seconds", gSavedSettings->getF32("SceneLoadingMonitorSampleTime")); + num_str = llformat("Sampling time: %.3f seconds", gSavedSettings.getF32("SceneLoadingMonitorSampleTime")); LLFontGL::getFontMonospace()->renderUTF8(num_str, 0, 5, getRect().getHeight() - line_height * lines, color, LLFontGL::LEFT, LLFontGL::TOP); lines++; |