From 1f56e57008f5a50c9e75fc0b4512c483ac359a52 Mon Sep 17 00:00:00 2001
From: Richard Linden <none@none>
Date: Tue, 18 Dec 2012 00:58:26 -0800
Subject: SH-3468 WIP add memory tracking base class created memory tracking
 trace type instrumented a few classes with memory tracking

---
 indra/llui/llviewmodel.cpp | 5 +++++
 1 file changed, 5 insertions(+)

(limited to 'indra/llui/llviewmodel.cpp')

diff --git a/indra/llui/llviewmodel.cpp b/indra/llui/llviewmodel.cpp
index a9f8acc440..dff0dcb2fd 100644
--- a/indra/llui/llviewmodel.cpp
+++ b/indra/llui/llviewmodel.cpp
@@ -80,7 +80,10 @@ LLTextViewModel::LLTextViewModel(const LLSD& value)
 void LLTextViewModel::setValue(const LLSD& value)
 {
 	LLViewModel::setValue(value);
+	memDisclaim(mDisplay);
     mDisplay = utf8str_to_wstring(value.asString());
+	memClaim(mDisplay);
+
     // mDisplay and mValue agree
     mUpdateFromDisplay = false;
 }
@@ -91,7 +94,9 @@ void LLTextViewModel::setDisplay(const LLWString& value)
     // and do the utf8str_to_wstring() to get the corresponding mDisplay
     // value. But a text editor might want to edit the display string
     // directly, then convert back to UTF8 on commit.
+	memDisclaim(mDisplay);
     mDisplay = value;
+	memClaim(mDisplay);
     mDirty = true;
     // Don't immediately convert to UTF8 -- do it lazily -- we expect many
     // more setDisplay() calls than getValue() calls. Just flag that it needs
-- 
cgit v1.2.3


From cbff0e7ab8afeebb6ddab854d35ea12ef9a9930a Mon Sep 17 00:00:00 2001
From: Richard Linden <none@none>
Date: Fri, 4 Jan 2013 13:48:35 -0800
Subject: SH-3468 WIP add memory tracking base class attempted fix for gcc
 compile errors can't use typeid() on a class that doesn't have a method
 defined in a translation unit fix is to force classes deriving from
 LLMemTrackable to use their own static member named sMemStat

---
 indra/llui/llviewmodel.cpp | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'indra/llui/llviewmodel.cpp')

diff --git a/indra/llui/llviewmodel.cpp b/indra/llui/llviewmodel.cpp
index dff0dcb2fd..1bd09e8086 100644
--- a/indra/llui/llviewmodel.cpp
+++ b/indra/llui/llviewmodel.cpp
@@ -35,6 +35,8 @@
 // external library headers
 // other Linden headers
 
+LLTrace::MemStat	LLViewModel::sMemStat("LLViewModel");
+
 ///
 LLViewModel::LLViewModel()
  : mDirty(false)
-- 
cgit v1.2.3


From f07b9c2c69f1f6882dcf249aacf33cdfacf878ab Mon Sep 17 00:00:00 2001
From: Richard Linden <none@none>
Date: Wed, 6 Mar 2013 11:08:25 -0800
Subject: renamed LLTrace stat gathering classes/methods to make the structure
 of LLTrace clearer Count becomes CountStatHandle Count.sum becomes sum(Count,
 value), etc.

---
 indra/llui/llviewmodel.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'indra/llui/llviewmodel.cpp')

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()
-- 
cgit v1.2.3