From c032bab9df0f034ba6b5512a7f9b97f3ca23fdd3 Mon Sep 17 00:00:00 2001
From: andreykproductengine <andreykproductengine@lindenlab.com>
Date: Tue, 21 Aug 2018 20:30:24 +0300
Subject: [PATCH] MAINT-5651 LLTrace issues on exit
---
indra/llcommon/llthread.cpp | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/indra/llcommon/llthread.cpp b/indra/llcommon/llthread.cpp
index 1f4aa9b3a63..f066e9a4cdd 100644
--- a/indra/llcommon/llthread.cpp
+++ b/indra/llcommon/llthread.cpp
@@ -249,9 +249,10 @@ void LLThread::shutdown()
// This thread just wouldn't stop, even though we gave it time
//LL_WARNS() << "LLThread::~LLThread() exiting thread before clean exit!" << LL_ENDL;
// Put a stake in its heart.
- delete mRecorder;
-
apr_thread_exit(mAPRThreadp, -1);
+ delete mRecorder;
+ mRecorder = NULL;
+ mStatus = STOPPED;
return;
}
mAPRThreadp = NULL;
--
GitLab