diff options
author | Oz Linden <oz@lindenlab.com> | 2013-06-03 18:06:45 -0400 |
---|---|---|
committer | Oz Linden <oz@lindenlab.com> | 2013-06-03 18:06:45 -0400 |
commit | 9acabccdde5cff91cac3bae0502c8ff5b26cada6 (patch) | |
tree | b6fc95044fc41cdc43969195f9c1939e8ecb0158 /indra/llcommon/llerrorthread.cpp | |
parent | dd2ede9991a9a31821fbe43a7fa17a5aafa19542 (diff) | |
parent | 7fa8c2313b47959ba8c0a40d92461f6892e0d0d3 (diff) |
merge changes for 3.6.0-materials-beta1
Diffstat (limited to 'indra/llcommon/llerrorthread.cpp')
-rwxr-xr-x | indra/llcommon/llerrorthread.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/llcommon/llerrorthread.cpp b/indra/llcommon/llerrorthread.cpp index 950fcd6e83..4a0c8ef342 100755 --- a/indra/llcommon/llerrorthread.cpp +++ b/indra/llcommon/llerrorthread.cpp @@ -106,7 +106,7 @@ void LLErrorThread::run() // This thread sits and waits for the sole purpose // of waiting for the signal/exception handlers to flag the // application state as APP_STATUS_ERROR. - llinfos << "thread_error - Waiting for an error" << llendl; + //llinfos << "thread_error - Waiting for an error" << llendl; S32 counter = 0; #if !LL_WINDOWS |