diff --git a/indra/llcommon/tests/llunits_test.cpp b/indra/llcommon/tests/llunits_test.cpp index a5df51f6deb02a123ac934cdde1d55a629eec02d..2074a4f4d94598f6b09e90714c8f13f182b82af0 100644 --- a/indra/llcommon/tests/llunits_test.cpp +++ b/indra/llcommon/tests/llunits_test.cpp @@ -164,7 +164,7 @@ namespace tut void units_object_t::test<5>() { // 0-initialized - LLUnit<F32, Quatloos> quatloos(0); + LLUnit<F32, Quatloos> quatloos; // initialize implicit unit from explicit LLUnitImplicit<F32, Quatloos> quatloos_implicit = quatloos + 1; ensure(quatloos_implicit == 1); diff --git a/indra/newview/llscenemonitor.cpp b/indra/newview/llscenemonitor.cpp index 29dd140158de5f4e5e7575b9973c7bf70c050496..022a950ecebabff10dae28717d5bdcb375eb4af2 100644 --- a/indra/newview/llscenemonitor.cpp +++ b/indra/newview/llscenemonitor.cpp @@ -491,7 +491,6 @@ void LLSceneMonitor::fetchQueryResult() if(mDiffResult > diff_threshold()) { mSceneLoadRecording.extend(); - llinfos << mSceneLoadRecording.getResults().getLastRecording().getDuration() << llendl; llassert_always(mSceneLoadRecording.getResults().getLastRecording().getDuration() > scene_load_sample_time); } else diff --git a/indra/newview/llscenemonitor.h b/indra/newview/llscenemonitor.h index b857389243c0c3356ed37622c99eb11bd5cccd8c..f94232e536a996ec1f34ed208a009bc4fd18b02d 100644 --- a/indra/newview/llscenemonitor.h +++ b/indra/newview/llscenemonitor.h @@ -100,7 +100,7 @@ class LLSceneMonitor : public LLSingleton<LLSceneMonitor> std::vector<LLAnimPauseRequest> mAvatarPauseHandles; - LLFrameTimer mRecordingTimer; + LLTimer mRecordingTimer; LLTrace::ExtendablePeriodicRecording mSceneLoadRecording; LLTrace::Recording mMonitorRecording; }; diff --git a/indra/newview/llstartup.cpp b/indra/newview/llstartup.cpp index 097ea7cc8dc5f9f67f713eb5d9d710f984c8656e..536c030637f6fbba4ef8143055d0a740e970c9f7 100755 --- a/indra/newview/llstartup.cpp +++ b/indra/newview/llstartup.cpp @@ -1185,6 +1185,7 @@ bool idle_startup() // create the default proximal channel LLVoiceChannel::initClass(); LLStartUp::setStartupState( STATE_WORLD_INIT); + LLTrace::get_frame_recording().reset(); } else {