4 files changed, 16 insertions, 48 deletions

diff --git a/indra/llui/llstatbar.cpp b/indra/llui/llstatbar.cpp
index 2d1b582598..1f8be3da62 100644
--- a/indra/llui/llstatbar.cpp
+++ b/indra/llui/llstatbar.cpp
@@ -47,8 +47,7 @@ LLStatBar::LLStatBar(const Params& p)
 	  mMinBar(p.bar_min),
 	  mMaxBar(p.bar_max),
 	  mStatp(LLStat::getInstance(p.stat)),
-	  mFloatStatp(LLTrace::Stat<F32>::getInstance(p.stat)),
-	  mIntStatp(LLTrace::Stat<S32>::getInstance(p.stat)),
+	  mFloatStatp(LLTrace::Rate<F32>::getInstance(p.stat)),
 	  mTickSpacing(p.tick_spacing),
 	  mLabelSpacing(p.label_spacing),
 	  mPrecision(p.precision),
@@ -112,40 +111,23 @@ void LLStatBar::draw()
 	}
 	else if (mFloatStatp)
 	{
-		LLTrace::Sampler* sampler = LLThread::getTraceData()->getPrimarySampler();
+		LLTrace::Sampler* sampler = LLTrace::get_thread_trace()->getPrimarySampler();
 		if (mPerSec)
 		{
 			current = sampler->getSum(*mFloatStatp) / sampler->getSampleTime();
-			min = sampler->getMin(*mFloatStatp) / sampler->getSampleTime();
-			max = sampler->getMax(*mFloatStatp) / sampler->getSampleTime();
-			mean = sampler->getMean(*mFloatStatp) / sampler->getSampleTime();
+			//min = sampler->getMin(*mFloatStatp) / sampler->getSampleTime();
+			//max = sampler->getMax(*mFloatStatp) / sampler->getSampleTime();
+			//mean = sampler->getMean(*mFloatStatp) / sampler->getSampleTime();
 		}
 		else
 		{
 			current = sampler->getSum(*mFloatStatp);
-			min = sampler->getMin(*mFloatStatp);
-			max = sampler->getMax(*mFloatStatp);
-			mean = sampler->getMean(*mFloatStatp);
-		}
-	}
-	else if (mIntStatp)
-	{
-		LLTrace::Sampler* sampler = LLThread::getTraceData()->getPrimarySampler();
-		if (mPerSec)
-		{
-			current = (F32)sampler->getSum(*mIntStatp) / sampler->getSampleTime();
-			min = (F32)sampler->getMin(*mIntStatp) / sampler->getSampleTime();
-			max = (F32)sampler->getMax(*mIntStatp) / sampler->getSampleTime();
-			mean = (F32)sampler->getMean(*mIntStatp) / sampler->getSampleTime();
-		}
-		else
-		{
-			current = (F32)sampler->getSum(*mIntStatp);
-			min = (F32)sampler->getMin(*mIntStatp);
-			max = (F32)sampler->getMax(*mIntStatp);
-			mean = (F32)sampler->getMean(*mIntStatp);
+			//min = sampler->getMin(*mFloatStatp);
+			//max = sampler->getMax(*mFloatStatp);
+			//mean = sampler->getMean(*mFloatStatp);
 		}
 	}
+	
 
 	if ((mUpdatesPerSec == 0.f) || (mUpdateTimer.getElapsedTimeF32() > 1.f/mUpdatesPerSec) || (mValue == 0.f))
 	{
diff --git a/indra/llui/llstatbar.h b/indra/llui/llstatbar.h
index 8348290abf..c735e7045b 100644
--- a/indra/llui/llstatbar.h
+++ b/indra/llui/llstatbar.h
@@ -36,6 +36,7 @@ class LLStat;
 class LLStatBar : public LLView
 {
 public:
+
 	struct Params : public LLInitParam::Block<Params, LLView::Params>
 	{
 		Optional<std::string> label;
@@ -93,8 +94,7 @@ private:
 	BOOL mDisplayMean;			// If true, display mean, if false, display current value
 
 	LLStat* mStatp;
-	LLTrace::Stat<F32>* mFloatStatp;
-	LLTrace::Stat<S32>* mIntStatp;
+	LLTrace::Rate<F32>* mFloatStatp;
 
 	LLFrameTimer mUpdateTimer;
 	LLUIString mLabel;
diff --git a/indra/llui/llstatgraph.cpp b/indra/llui/llstatgraph.cpp
index 19896c4597..e0d7623999 100644
--- a/indra/llui/llstatgraph.cpp
+++ b/indra/llui/llstatgraph.cpp
@@ -48,8 +48,7 @@ LLStatGraph::LLStatGraph(const Params& p)
 	mPrecision(p.precision),
 	mValue(p.value),
 	mStatp(p.stat.legacy_stat),
-	mF32Statp(p.stat.f32_stat),
-	mS32Statp(p.stat.s32_stat)
+	mF32Statp(p.stat.rate_stat)
 {
 	setToolTip(p.name());
 
@@ -86,7 +85,7 @@ void LLStatGraph::draw()
 	}
 	else if (mF32Statp)
 	{
-		LLTrace::Sampler* sampler = LLThread::getTraceData()->getPrimarySampler();
+		LLTrace::Sampler* sampler = LLTrace::get_thread_trace()->getPrimarySampler();
 
 		if (mPerSec)
 		{
@@ -98,19 +97,7 @@ void LLStatGraph::draw()
 		}
 
 	}
-	else if (mS32Statp)
-	{
-		LLTrace::Sampler* sampler = LLThread::getTraceData()->getPrimarySampler();
 
-		if (mPerSec)
-		{
-			mValue = sampler->getSum(*mS32Statp) / sampler->getSampleTime();
-		}
-		else
-		{
-			mValue = sampler->getSum(*mS32Statp);
-		}
-	}
 	frac = (mValue - mMin) / range;
 	frac = llmax(0.f, frac);
 	frac = llmin(1.f, frac);
diff --git a/indra/llui/llstatgraph.h b/indra/llui/llstatgraph.h
index e7de945694..69fc36ea52 100644
--- a/indra/llui/llstatgraph.h
+++ b/indra/llui/llstatgraph.h
@@ -60,8 +60,7 @@ public:
 	struct StatParams : public LLInitParam::ChoiceBlock<StatParams>
 	{
 		Alternative<LLStat*>				legacy_stat;
-		Alternative<LLTrace::Stat<F32>* >	f32_stat;
-		Alternative<LLTrace::Stat<S32>* >	s32_stat;
+		Alternative<LLTrace::Rate<F32>* >	rate_stat;
 	};
 
 	struct Params : public LLInitParam::Block<Params, LLView::Params>
@@ -107,8 +106,8 @@ public:
 	
 private:
 	LLStat*				mStatp;
-	LLTrace::Stat<F32>*	mF32Statp;
-	LLTrace::Stat<S32>*	mS32Statp;
+	LLTrace::Rate<F32>*	mF32Statp;
+	LLTrace::Rate<S32>*	mS32Statp;
 
 	BOOL mPerSec;