SH-4653 FIX Interesting: Viewer crashes while reading chat history

fix for crash on exit resulting from 8c0e024d0c33

1 files changed, 12 insertions, 2 deletions

diff --git a/indra/llcommon/llthread.cpp b/indra/llcommon/llthread.cpp
index 3e3c876a54..cf7768c67b 100755
--- a/indra/llcommon/llthread.cpp
+++ b/indra/llcommon/llthread.cpp
@@ -146,6 +146,9 @@ void *APR_THREAD_FUNC LLThread::staticRun(apr_thread_t *apr_threadp, void *datap
 	// We're done with the run function, this thread is done executing now.
 	threadp->mStatus = STOPPED;
 
+	delete threadp->mRecorder;
+	threadp->mRecorder = NULL;
+
 	return NULL;
 }
 
@@ -153,7 +156,8 @@ LLThread::LLThread(const std::string& name, apr_pool_t *poolp) :
 	mPaused(FALSE),
 	mName(name),
 	mAPRThreadp(NULL),
-	mStatus(STOPPED)
+	mStatus(STOPPED),
+	mRecorder(NULL)
 {
 
 	mID = ++sIDIter;
@@ -242,7 +246,13 @@ void LLThread::shutdown()
 		mAPRPoolp = 0;
 	}
 
-	delete mRecorder;
+	if (mRecorder)
+	{
+		// missed chance to properly shut down recorder (needs to be done in thread context)
+		// probably due to abnormal thread termination
+		// so just leak it and remove it from parent
+		LLTrace::get_master_thread_recorder()->removeChildRecorder(mRecorder);
+	}
 }