diff options
| author | Richard Linden <none@none> | 2013-10-11 10:42:44 -0700 |
|---|---|---|
| committer | Richard Linden <none@none> | 2013-10-11 10:42:44 -0700 |
| commit | a6a40bd69f2011337b138d833d412b2b3568f8ea (patch) | |
| tree | 541e8ba677d7e7c36900a4f3491b23d656d7b260 /indra/llcommon | |
| parent | c8067cfd9708fe30659b1f07f6d035508bea3033 (diff) | |
| parent | 7f67e1d4a42037a902a547aef845b46c38f33f2a (diff) | |
Automated merge with http://bitbucket.org/lindenlab/viewer-interesting
Diffstat (limited to 'indra/llcommon')
| -rwxr-xr-x | indra/llcommon/llthread.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/llcommon/llthread.cpp b/indra/llcommon/llthread.cpp index 3f2127762e..cbf78bb363 100755 --- a/indra/llcommon/llthread.cpp +++ b/indra/llcommon/llthread.cpp @@ -109,7 +109,7 @@ LL_COMMON_API void assert_main_thread() if (LLThread::currentID() != s_thread_id) { LL_WARNS() << "Illegal execution from thread id " << (S32) LLThread::currentID() - << " outside main thread " << (S32) s_thread_id << llendl; + << " outside main thread " << (S32) s_thread_id << LL_ENDL; } } |