diff options
| author | Richard Linden <none@none> | 2013-12-10 10:36:54 -0800 |
|---|---|---|
| committer | Richard Linden <none@none> | 2013-12-10 10:36:54 -0800 |
| commit | 8d5605e09f144e7879c34e6093b5c09c191f46a6 (patch) | |
| tree | 1fee98c7dec4bc239fa72d668147af8e6d915e81 /indra/llcommon | |
| parent | 1459c6dfd79f95d24fe15093feb99c0ac25f508d (diff) | |
| parent | 5d2241b3d6373f528626ebb043aeea8ad8dc355f (diff) | |
Automated merge with http://bitbucket.org/lindenlab/viewer-interesting
Diffstat (limited to 'indra/llcommon')
| -rwxr-xr-x | indra/llcommon/llthread.cpp | 2 | ||||
| -rw-r--r-- | indra/llcommon/lltrace.cpp | 2 |
2 files changed, 2 insertions, 2 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; } |