SH-3275 WIP Run viewer metrics for object update messages

fixed various issues related to unit tests and LLThreadLocalPtr initialization and teardown

1 files changed, 5 insertions, 0 deletions

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();
 		}
 	};