diff options
| author | Richard Linden <none@none> | 2012-11-13 17:10:10 -0800 |
|---|---|---|
| committer | Richard Linden <none@none> | 2012-11-13 17:10:10 -0800 |
| commit | 67ec47e6da389661934ed2ddfa55ca58455fa7e5 (patch) | |
| tree | d18f9d7b91fe3a30204d992062ce465e90f5d171 /indra/llui | |
| parent | c76ed72c609b80b08df6cebd68274c9da6d3de2c (diff) | |
SH-3406 WIP convert fast timers to lltrace system
moving fast timers into lltrace namespace and accumulation system
Diffstat (limited to 'indra/llui')
| -rw-r--r-- | indra/llui/llstatbar.h | 8 | ||||
| -rw-r--r-- | indra/llui/llstatgraph.h | 8 |
2 files changed, 8 insertions, 8 deletions
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> |