diff options
| author | Richard Linden <none@none> | 2013-06-27 00:08:58 -0700 |
|---|---|---|
| committer | Richard Linden <none@none> | 2013-06-27 00:08:58 -0700 |
| commit | 0f178ec33debc6d92f3b2aa2392e640eb342a095 (patch) | |
| tree | eb13db7dc222dda47b6a78c0e40299ef1e74fafc /indra/llcommon/llthread.cpp | |
| parent | 88fee7f87fc4a987a05002fedfcae11d6b42ba59 (diff) | |
| parent | 808d3eff198d65e5a870abb670786935fc8356bd (diff) | |
Automated merge with http://bitbucket.org/lindenlab/viewer-interesting
Diffstat (limited to 'indra/llcommon/llthread.cpp')
| -rwxr-xr-x | indra/llcommon/llthread.cpp | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/indra/llcommon/llthread.cpp b/indra/llcommon/llthread.cpp index 118568d5ef..e8e546e769 100755 --- a/indra/llcommon/llthread.cpp +++ b/indra/llcommon/llthread.cpp @@ -93,7 +93,7 @@ void *APR_THREAD_FUNC LLThread::staticRun(apr_thread_t *apr_threadp, void *datap { LLThread *threadp = (LLThread *)datap; - LLTrace::ThreadRecorder* thread_recorder = new LLTrace::SlaveThreadRecorder(LLTrace::getUIThreadRecorder()); + LLTrace::SlaveThreadRecorder thread_recorder(LLTrace::getUIThreadRecorder()); #if !LL_DARWIN sThreadID = threadp->mID; @@ -107,8 +107,6 @@ 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 thread_recorder; - return NULL; } |