diff options
| author | andreykproductengine <andreykproductengine@lindenlab.com> | 2018-08-21 20:30:24 +0300 |
|---|---|---|
| committer | andreykproductengine <andreykproductengine@lindenlab.com> | 2018-08-21 20:30:24 +0300 |
| commit | c032bab9df0f034ba6b5512a7f9b97f3ca23fdd3 (patch) | |
| tree | cb7684f5030f13b73a5cfde0d5b204c24eda0852 /indra | |
| parent | ae1e9ca0a4bf82181f61a966e6e84600631d52c9 (diff) | |
MAINT-5651 LLTrace issues on exit
Diffstat (limited to 'indra')
| -rw-r--r-- | indra/llcommon/llthread.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/indra/llcommon/llthread.cpp b/indra/llcommon/llthread.cpp index 1f4aa9b3a6..f066e9a4cd 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; |