summaryrefslogtreecommitdiff
path: root/indra/llui/llstatbar.cpp
diff options
context:
space:
mode:
authorRichard Linden <none@none>2013-03-06 11:08:49 -0800
committerRichard Linden <none@none>2013-03-06 11:08:49 -0800
commit4a5f14afc987b645c68705b0313aebbc3ba1d811 (patch)
treebe3c96145b3be558b0131978a7c53c3aece15852 /indra/llui/llstatbar.cpp
parenta6bb68b6e530df91d03abfc062c700ebc4e856aa (diff)
parentf07b9c2c69f1f6882dcf249aacf33cdfacf878ab (diff)
Automated merge with ssh://hg.lindenlab.com/richard/viewer-interesting-metrics
Diffstat (limited to 'indra/llui/llstatbar.cpp')
-rw-r--r--indra/llui/llstatbar.cpp16
1 files changed, 8 insertions, 8 deletions
diff --git a/indra/llui/llstatbar.cpp b/indra/llui/llstatbar.cpp
index 1bc9a9fc67..954f615210 100644
--- a/indra/llui/llstatbar.cpp
+++ b/indra/llui/llstatbar.cpp
@@ -45,10 +45,10 @@ LLStatBar::LLStatBar(const Params& p)
mUnitLabel(p.unit_label),
mMinBar(p.bar_min),
mMaxBar(p.bar_max),
- mCountFloatp(LLTrace::Count<>::getInstance(p.stat)),
- mCountIntp(LLTrace::Count<S64>::getInstance(p.stat)),
- mMeasurementFloatp(LLTrace::Measurement<>::getInstance(p.stat)),
- mMeasurementIntp(LLTrace::Measurement<S64>::getInstance(p.stat)),
+ mCountFloatp(LLTrace::CountStatHandle<>::getInstance(p.stat)),
+ mCountIntp(LLTrace::CountStatHandle<S64>::getInstance(p.stat)),
+ mMeasurementFloatp(LLTrace::MeasurementStatHandle<>::getInstance(p.stat)),
+ mMeasurementIntp(LLTrace::MeasurementStatHandle<S64>::getInstance(p.stat)),
mTickSpacing(p.tick_spacing),
mLabelSpacing(p.label_spacing),
mPrecision(p.precision),
@@ -336,10 +336,10 @@ void LLStatBar::draw()
void LLStatBar::setStat(const std::string& stat_name)
{
- mCountFloatp = LLTrace::Count<>::getInstance(stat_name);
- mCountIntp = LLTrace::Count<S64>::getInstance(stat_name);
- mMeasurementFloatp = LLTrace::Measurement<>::getInstance(stat_name);
- mMeasurementIntp = LLTrace::Measurement<S64>::getInstance(stat_name);
+ mCountFloatp = LLTrace::CountStatHandle<>::getInstance(stat_name);
+ mCountIntp = LLTrace::CountStatHandle<S64>::getInstance(stat_name);
+ mMeasurementFloatp = LLTrace::MeasurementStatHandle<>::getInstance(stat_name);
+ mMeasurementIntp = LLTrace::MeasurementStatHandle<S64>::getInstance(stat_name);
}