From 67ec47e6da389661934ed2ddfa55ca58455fa7e5 Mon Sep 17 00:00:00 2001
From: Richard Linden <none@none>
Date: Tue, 13 Nov 2012 17:10:10 -0800
Subject: SH-3406 WIP convert fast timers to lltrace system moving fast timers
 into lltrace namespace and accumulation system

---
 indra/llui/llstatbar.h   | 8 ++++----
 indra/llui/llstatgraph.h | 8 ++++----
 2 files changed, 8 insertions(+), 8 deletions(-)

(limited to 'indra/llui')

diff --git a/indra/llui/llstatbar.h b/indra/llui/llstatbar.h
index 083da8444e..17c9c09cb2 100644
--- a/indra/llui/llstatbar.h
+++ b/indra/llui/llstatbar.h
@@ -100,10 +100,10 @@ private:
 	BOOL mDisplayHistory;
 	BOOL mDisplayMean;			// If true, display mean, if false, display current value
 
-	LLTrace::count_common_float_t* mCountFloatp;
-	LLTrace::count_common_int_t* mCountIntp;
-	LLTrace::measurement_common_float_t* mMeasurementFloatp;
-	LLTrace::measurement_common_int_t* mMeasurementIntp;
+	LLTrace::TraceType<CountAccumulator<F64> >* mCountFloatp;
+	LLTrace::TraceType<CountAccumulator<S64> >* mCountIntp;
+	LLTrace::TraceType<MeasurementAccumulator<F64> >* mMeasurementFloatp;
+	LLTrace::TraceType<MeasurementAccumulator<S64> >* mMeasurementIntp;
 
 	LLFrameTimer mUpdateTimer;
 	LLUIString mLabel;
diff --git a/indra/llui/llstatgraph.h b/indra/llui/llstatgraph.h
index f33c784262..09b34c2358 100644
--- a/indra/llui/llstatgraph.h
+++ b/indra/llui/llstatgraph.h
@@ -57,10 +57,10 @@ public:
 
 	struct StatParams : public LLInitParam::ChoiceBlock<StatParams>
 	{
-		Alternative<LLTrace::count_common_float_t* >	count_stat_float;
-		Alternative<LLTrace::count_common_int_t* >		count_stat_int;
-		Alternative<LLTrace::measurement_common_float_t* >	measurement_stat_float;
-		Alternative<LLTrace::measurement_common_int_t* >	measurement_stat_int;
+		Alternative<LLTrace::TraceType<CountAccumulator<F64> >* >		count_stat_float;
+		Alternative<LLTrace::TraceType<CountAccumulator<S64> >* >		count_stat_int;
+		Alternative<LLTrace::TraceType<MeasurementAccumulator<F64> >* >	measurement_stat_float;
+		Alternative<LLTrace::TraceType<MeasurementAccumulator<S64> >* >	measurement_stat_int;
 	};
 
 	struct Params : public LLInitParam::Block<Params, LLView::Params>
-- 
cgit v1.3