From 8208a40412fac35593d4b8b13f43c6be5e4d6990 Mon Sep 17 00:00:00 2001
From: Richard Linden <none@none>
Date: Mon, 1 Jul 2013 18:50:51 -0700
Subject: BUILDFIX: reverted changes that attempted to automate mem track stat
 definition as they don't work on gcc/clang

---
 indra/llui/lltextbase.cpp  | 2 ++
 indra/llui/lltextbase.h    | 2 ++
 indra/llui/llview.cpp      | 1 +
 indra/llui/llview.h        | 1 +
 indra/llui/llviewmodel.cpp | 2 ++
 indra/llui/llviewmodel.h   | 2 ++
 6 files changed, 10 insertions(+)

(limited to 'indra/llui')

diff --git a/indra/llui/lltextbase.cpp b/indra/llui/lltextbase.cpp
index 9845941778..7243931dbb 100755
--- a/indra/llui/lltextbase.cpp
+++ b/indra/llui/lltextbase.cpp
@@ -48,6 +48,8 @@ const F32	CURSOR_FLASH_DELAY = 1.0f;  // in seconds
 const S32	CURSOR_THICKNESS = 2;
 const F32	TRIPLE_CLICK_INTERVAL = 0.3f;	// delay between double and triple click.
 
+LLTrace::MemStatHandle	LLTextSegment::sMemStat("LLTextSegment");
+
 LLTextBase::line_info::line_info(S32 index_start, S32 index_end, LLRect rect, S32 line_num) 
 :	mDocIndexStart(index_start), 
 	mDocIndexEnd(index_end),
diff --git a/indra/llui/lltextbase.h b/indra/llui/lltextbase.h
index 3e93b7de65..74dc7f9693 100755
--- a/indra/llui/lltextbase.h
+++ b/indra/llui/lltextbase.h
@@ -100,6 +100,8 @@ public:
 	S32						getEnd() const						{ return mEnd; }
 	void					setEnd( S32 end )					{ mEnd = end; }
 
+	static LLTrace::MemStatHandle sMemStat;
+
 protected:
 	S32				mStart;
 	S32				mEnd;
diff --git a/indra/llui/llview.cpp b/indra/llui/llview.cpp
index b2805a32e8..daeb4d7939 100755
--- a/indra/llui/llview.cpp
+++ b/indra/llui/llview.cpp
@@ -69,6 +69,7 @@ LLView* LLView::sPreviewClickedElement = NULL;
 BOOL	LLView::sDrawPreviewHighlights = FALSE;
 S32		LLView::sLastLeftXML = S32_MIN;
 S32		LLView::sLastBottomXML = S32_MIN;
+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 62bfb54566..0568fa889a 100755
--- a/indra/llui/llview.h
+++ b/indra/llui/llview.h
@@ -675,6 +675,7 @@ public:
 	static S32 sLastLeftXML;
 	static S32 sLastBottomXML;
 	static BOOL sForceReshape;
+	static LLTrace::MemStatHandle sMemStat;
 };
 
 namespace LLInitParam
diff --git a/indra/llui/llviewmodel.cpp b/indra/llui/llviewmodel.cpp
index dff0dcb2fd..901260bec8 100755
--- a/indra/llui/llviewmodel.cpp
+++ b/indra/llui/llviewmodel.cpp
@@ -35,6 +35,8 @@
 // external library headers
 // other Linden headers
 
+LLTrace::MemStatHandle	LLViewModel::sMemStat("LLViewModel");
+
 ///
 LLViewModel::LLViewModel()
  : mDirty(false)
diff --git a/indra/llui/llviewmodel.h b/indra/llui/llviewmodel.h
index a2ca20c739..2c016d2560 100755
--- a/indra/llui/llviewmodel.h
+++ b/indra/llui/llviewmodel.h
@@ -83,6 +83,8 @@ public:
 	// 
     void setDirty() { mDirty = true; }
 
+	static LLTrace::MemStatHandle sMemStat;
+
 protected:
     LLSD mValue;
     bool mDirty;
-- 
cgit v1.2.3