diff options
| author | Richard Linden <none@none> | 2013-05-29 17:03:45 -0700 |
|---|---|---|
| committer | Richard Linden <none@none> | 2013-05-29 17:03:45 -0700 |
| commit | 174cfa0a7a49110dc2ff13850aa5ff48916711dc (patch) | |
| tree | f37413130f8c2628e5c0652458fc4fa4e0a653ba /indra/llui/llstatbar.h | |
| parent | 52e8b2a1a279e13a39a95b32a301780998b8d8c4 (diff) | |
| parent | 074c1f1de45f60059c97cf9cfd0bbb9fddbb52c4 (diff) | |
Automated merge with ssh://hg.lindenlab.com/richard/viewer-interesting/
Diffstat (limited to 'indra/llui/llstatbar.h')
| -rw-r--r-- | indra/llui/llstatbar.h | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/indra/llui/llstatbar.h b/indra/llui/llstatbar.h index db667aa07d..a0ed9699aa 100644 --- a/indra/llui/llstatbar.h +++ b/indra/llui/llstatbar.h @@ -111,10 +111,12 @@ private: bool mScaleRange; EOrientation mOrientation; - LLTrace::TraceType<LLTrace::CountAccumulator<F64> >* mCountFloatp; - LLTrace::TraceType<LLTrace::CountAccumulator<S64> >* mCountIntp; - LLTrace::TraceType<LLTrace::MeasurementAccumulator<F64> >* mMeasurementFloatp; - LLTrace::TraceType<LLTrace::MeasurementAccumulator<S64> >* mMeasurementIntp; + LLTrace::TraceType<LLTrace::CountAccumulator<F64> >* mCountFloatp; + LLTrace::TraceType<LLTrace::CountAccumulator<S64> >* mCountIntp; + LLTrace::TraceType<LLTrace::EventAccumulator<F64> >* mEventFloatp; + LLTrace::TraceType<LLTrace::EventAccumulator<S64> >* mEventIntp; + LLTrace::TraceType<LLTrace::SampleAccumulator<F64> >* mSampleFloatp; + LLTrace::TraceType<LLTrace::SampleAccumulator<S64> >* mSampleIntp; LLFrameTimer mUpdateTimer; LLUIString mLabel; |