summaryrefslogtreecommitdiff
path: root/indra/llcommon/llthread.cpp
diff options
context:
space:
mode:
authorRichard Linden <none@none>2013-12-05 21:59:04 -0800
committerRichard Linden <none@none>2013-12-05 21:59:04 -0800
commit5d2241b3d6373f528626ebb043aeea8ad8dc355f (patch)
tree773e3e6751f8cdfdbb4433e280ed23caf4f8c0f0 /indra/llcommon/llthread.cpp
parent24a2ba735540f896bb84dfdbaff8644b1d60044b (diff)
parent6b84d405582e87e0b7e0a3b0cbc5635651af5e3b (diff)
Automated merge with http://bitbucket.org/lindenlab/viewer-interesting
Diffstat (limited to 'indra/llcommon/llthread.cpp')
-rwxr-xr-xindra/llcommon/llthread.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/llcommon/llthread.cpp b/indra/llcommon/llthread.cpp
index cbf78bb363..cf105098ef 100755
--- a/indra/llcommon/llthread.cpp
+++ b/indra/llcommon/llthread.cpp
@@ -131,7 +131,7 @@ void *APR_THREAD_FUNC LLThread::staticRun(apr_thread_t *apr_threadp, void *datap
set_thread_name(-1, threadp->mName.c_str());
#endif
-
+ // for now, hard code all LLThreads to report to single master thread recorder, which is known to be running on main thread
LLTrace::ThreadRecorder thread_recorder(*LLTrace::get_master_thread_recorder());
#if !LL_DARWIN