diff options
| author | Rider Linden <rider@lindenlab.com> | 2018-09-26 13:46:45 -0700 |
|---|---|---|
| committer | Rider Linden <rider@lindenlab.com> | 2018-09-26 13:46:45 -0700 |
| commit | 78866b33a9f3a44db11a18245e8a37c834297a46 (patch) | |
| tree | fd5c39a17334de8602ee2f20df020eaaa6e01e55 /indra/llcommon/llthread.cpp | |
| parent | 2d5fa7a732661f97b028ddcbabdd4fb3ba825a52 (diff) | |
| parent | 58aef8beaf79dc83546a7b080014ca5030733ac8 (diff) | |
Merge
Diffstat (limited to 'indra/llcommon/llthread.cpp')
| -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; |