fix for heap corruption crash on shutdown

don't set stopped flag until recorder object has been deleted

1 files changed, 4 insertions, 3 deletions

diff --git a/indra/llcommon/llthread.cpp b/indra/llcommon/llthread.cpp
index cf7768c67b..fd1f8ee096 100755
--- a/indra/llcommon/llthread.cpp
+++ b/indra/llcommon/llthread.cpp
@@ -143,12 +143,13 @@ void *APR_THREAD_FUNC LLThread::staticRun(apr_thread_t *apr_threadp, void *datap
 
 	//LL_INFOS() << "LLThread::staticRun() Exiting: " << threadp->mName << LL_ENDL;
 	
-	// We're done with the run function, this thread is done executing now.
-	threadp->mStatus = STOPPED;
-
 	delete threadp->mRecorder;
 	threadp->mRecorder = NULL;
 
+	// We're done with the run function, this thread is done executing now.
+	//NB: we are using this flag to sync across threads...we really need memory barriers here
+	threadp->mStatus = STOPPED;
+
 	return NULL;
 }