diff options
| -rwxr-xr-x | indra/llcommon/llthread.cpp | 2 | ||||
| -rw-r--r-- | indra/llcommon/lltrace.cpp | 2 | ||||
| -rwxr-xr-x | indra/newview/llappviewer.cpp | 2 |
3 files changed, 3 insertions, 3 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 diff --git a/indra/llcommon/lltrace.cpp b/indra/llcommon/lltrace.cpp index 5c4b7b5bb4..14e830af7d 100644 --- a/indra/llcommon/lltrace.cpp +++ b/indra/llcommon/lltrace.cpp @@ -40,7 +40,7 @@ StatBase::StatBase( const char* name, const char* description ) mDescription(description ? description : "") { #ifndef LL_RELEASE_FOR_DOWNLOAD - if (LLTrace::get_master_thread_recorder() != NULL) + if (LLTrace::get_thread_recorder() != NULL) { LL_ERRS() << "Attempting to declare trace object after program initialization. Trace objects should be statically initialized." << LL_ENDL; } diff --git a/indra/newview/llappviewer.cpp b/indra/newview/llappviewer.cpp index 9a31b6b51f..a7f5eb48a4 100755 --- a/indra/newview/llappviewer.cpp +++ b/indra/newview/llappviewer.cpp @@ -1325,7 +1325,7 @@ bool LLAppViewer::mainLoop() LLTrace::get_frame_recording().nextPeriod(); LLTrace::BlockTimer::logStats(); - LLTrace::get_master_thread_recorder()->pullFromChildren(); + LLTrace::get_thread_recorder()->pullFromChildren(); //clear call stack records LL_CLEAR_CALLSTACKS(); |