7 files changed, 14 insertions, 14 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);
 }
 
 
diff --git a/indra/llui/lltextbase.cpp b/indra/llui/lltextbase.cpp
index 74e966560e..680b6ed16d 100644
--- a/indra/llui/lltextbase.cpp
+++ b/indra/llui/lltextbase.cpp
@@ -47,7 +47,7 @@
 const F32	CURSOR_FLASH_DELAY = 1.0f;  // in seconds
 const S32	CURSOR_THICKNESS = 2;
 
-LLTrace::MemStat	LLTextSegment::sMemStat("LLTextSegment");
+LLTrace::MemStatHandle	LLTextSegment::sMemStat("LLTextSegment");
 
 LLTextBase::line_info::line_info(S32 index_start, S32 index_end, LLRect rect, S32 line_num) 
 :	mDocIndexStart(index_start), 
diff --git a/indra/llui/lltextbase.h b/indra/llui/lltextbase.h
index 7d791ec75a..2ce15d891a 100644
--- a/indra/llui/lltextbase.h
+++ b/indra/llui/lltextbase.h
@@ -99,7 +99,7 @@ public:
 	S32						getEnd() const						{ return mEnd; }
 	void					setEnd( S32 end )					{ mEnd = end; }
 
-	static LLTrace::MemStat sMemStat;
+	static LLTrace::MemStatHandle sMemStat;
 
 protected:
 	S32				mStart;
diff --git a/indra/llui/llview.cpp b/indra/llui/llview.cpp
index 47bf410af6..587953477d 100644
--- a/indra/llui/llview.cpp
+++ b/indra/llui/llview.cpp
@@ -67,7 +67,7 @@ LLView* LLView::sPreviewClickedElement = NULL;
 BOOL	LLView::sDrawPreviewHighlights = FALSE;
 S32		LLView::sLastLeftXML = S32_MIN;
 S32		LLView::sLastBottomXML = S32_MIN;
-LLTrace::MemStat	LLView::sMemStat("LLView");
+LLTrace::MemStatHandle	LLView::sMemStat("LLView");
 std::vector<LLViewDrawContext*> LLViewDrawContext::sDrawContextStack;
 
 LLView::DrilldownFunc LLView::sDrilldown =
diff --git a/indra/llui/llview.h b/indra/llui/llview.h
index 256f86c00d..e18cfff8e5 100644
--- a/indra/llui/llview.h
+++ b/indra/llui/llview.h
@@ -673,7 +673,7 @@ public:
 	static S32 sLastLeftXML;
 	static S32 sLastBottomXML;
 	static BOOL sForceReshape;
-	static LLTrace::MemStat sMemStat;
+	static LLTrace::MemStatHandle sMemStat;
 };
 
 class LLCompareByTabOrder
diff --git a/indra/llui/llviewmodel.cpp b/indra/llui/llviewmodel.cpp
index 1bd09e8086..901260bec8 100644
--- a/indra/llui/llviewmodel.cpp
+++ b/indra/llui/llviewmodel.cpp
@@ -35,7 +35,7 @@
 // external library headers
 // other Linden headers
 
-LLTrace::MemStat	LLViewModel::sMemStat("LLViewModel");
+LLTrace::MemStatHandle	LLViewModel::sMemStat("LLViewModel");
 
 ///
 LLViewModel::LLViewModel()
diff --git a/indra/llui/llviewmodel.h b/indra/llui/llviewmodel.h
index 214780393b..2c016d2560 100644
--- a/indra/llui/llviewmodel.h
+++ b/indra/llui/llviewmodel.h
@@ -83,7 +83,7 @@ public:
 	// 
     void setDirty() { mDirty = true; }
 
-	static LLTrace::MemStat sMemStat;
+	static LLTrace::MemStatHandle sMemStat;
 
 protected:
     LLSD mValue;