From bfd1c0370fe9f7a2372365f890bf88cf00c52f77 Mon Sep 17 00:00:00 2001
From: Kelly Washington <kelly@lindenlab.com>
Date: Fri, 20 Jul 2012 13:28:04 -0700
Subject: MAINT-570 Remove unused memory tracking system LLMemType follow up to
 fix test compiles.

---
 indra/llimage/tests/llimageworker_test.cpp | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

(limited to 'indra/llimage/tests')

diff --git a/indra/llimage/tests/llimageworker_test.cpp b/indra/llimage/tests/llimageworker_test.cpp
index 08476fb72c..e255d65b43 100644
--- a/indra/llimage/tests/llimageworker_test.cpp
+++ b/indra/llimage/tests/llimageworker_test.cpp
@@ -49,8 +49,7 @@ mWidth(0),
 mHeight(0),
 mComponents(0),
 mBadBufferAllocation(false),
-mAllowOverSize(false),
-mMemType(LLMemType::MTYPE_IMAGEBASE)
+mAllowOverSize(false)
 {
 }
 LLImageBase::~LLImageBase() {}
-- 
cgit v1.2.3


From 05a3203d8274a0a0999faad128f629614b8d62c5 Mon Sep 17 00:00:00 2001
From: Richard Linden <none@none>
Date: Wed, 26 Sep 2012 17:04:57 -0700
Subject: SH-3275 WIP Run viewer metrics for object update messages fixed
 various issues related to unit tests and LLThreadLocalPtr initialization and
 teardown

---
 indra/llimage/tests/llimageworker_test.cpp | 5 +++++
 1 file changed, 5 insertions(+)

(limited to 'indra/llimage/tests')

diff --git a/indra/llimage/tests/llimageworker_test.cpp b/indra/llimage/tests/llimageworker_test.cpp
index e255d65b43..be7aae4eb7 100644
--- a/indra/llimage/tests/llimageworker_test.cpp
+++ b/indra/llimage/tests/llimageworker_test.cpp
@@ -114,11 +114,13 @@ namespace tut
 		// Constructor and destructor of the test wrapper
 		imagedecodethread_test()
 		{
+			LLTrace::init();
 			mThread = NULL;
 		}
 		~imagedecodethread_test()
 		{
 			delete mThread;
+			LLTrace::cleanup();
 		}
 	};
 
@@ -136,6 +138,8 @@ namespace tut
 		imagerequest_test()
 		{
 			done = false;
+			LLTrace::init();
+
 			mRequest = new LLImageDecodeThread::ImageRequest(0, 0,
 											 LLQueuedThread::PRIORITY_NORMAL, 0, FALSE,
 											 new responder_test(&done));
@@ -145,6 +149,7 @@ namespace tut
 			// We should delete the object *but*, because its destructor is protected, that cannot be
 			// done from outside an LLImageDecodeThread instance... So we leak memory here... It's fine...
 			//delete mRequest;
+			LLTrace::cleanup();
 		}
 	};
 
-- 
cgit v1.2.3


From 38354e19063478c8cda0408547ad05023b457041 Mon Sep 17 00:00:00 2001
From: Richard Linden <none@none>
Date: Fri, 28 Sep 2012 10:45:14 -0700
Subject: SH-3275 WIP Run viewer metrics for object update messages created
 separate constructor for static allocation of sampler buffer fixed
 start/stop/resume semantics of samplers and added sampler time interval
 tracking

---
 indra/llimage/tests/llimageworker_test.cpp | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'indra/llimage/tests')

diff --git a/indra/llimage/tests/llimageworker_test.cpp b/indra/llimage/tests/llimageworker_test.cpp
index be7aae4eb7..29497257ac 100644
--- a/indra/llimage/tests/llimageworker_test.cpp
+++ b/indra/llimage/tests/llimageworker_test.cpp
@@ -31,6 +31,8 @@
 #include "../llimageworker.h"
 // For timer class
 #include "../llcommon/lltimer.h"
+// for lltrace class
+#include "../llcommon/lltrace.h"
 // Tut header
 #include "../test/lltut.h"
 
-- 
cgit v1.2.3