summaryrefslogtreecommitdiff
path: root/indra/llui
diff options
context:
space:
mode:
Diffstat (limited to 'indra/llui')
-rw-r--r--indra/llui/llstatbar.h8
-rw-r--r--indra/llui/llstatgraph.h8
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>