removed debug spam

fast timer data now resets on login

5 files changed, 3 insertions, 4 deletions

diff --git a/indra/llcommon/tests/llunits_test.cpp b/indra/llcommon/tests/llunits_test.cpp
index a5df51f6de..2074a4f4d9 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/llappviewer.cpp b/indra/newview/llappviewer.cpp
index 47492aaa31..5f6b183fcc 100755
--- a/indra/newview/llappviewer.cpp
+++ b/indra/newview/llappviewer.cpp
@@ -1294,7 +1294,6 @@ bool LLAppViewer::mainLoop()
 	{
 		LLFastTimer _(FTM_FRAME);
 		LLTrace::TimeBlock::processTimes();
-		llassert(LLStatViewer::FPS.getPrimaryAccumulator()->getSampleCount() <= 1);
 		LLTrace::get_frame_recording().nextPeriod();
 		LLTrace::TimeBlock::logStats();
 
diff --git a/indra/newview/llscenemonitor.cpp b/indra/newview/llscenemonitor.cpp
index 29dd140158..022a950ece 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 b857389243..f94232e536 100644
--- a/indra/newview/llscenemonitor.h
+++ b/indra/newview/llscenemonitor.h
@@ -100,7 +100,7 @@ private:
 
 	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 097ea7cc8d..536c030637 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
 			{