diff options
author | Dave Parks <davep@lindenlab.com> | 2012-06-28 13:50:35 -0500 |
---|---|---|
committer | Dave Parks <davep@lindenlab.com> | 2012-06-28 13:50:35 -0500 |
commit | db5d1b851a0d808dc1e8b0896fad734c2c54a03f (patch) | |
tree | ebe50ddb5e1aa700d54f50bbc1ab4b435462b85e /indra/llcommon/llerrorthread.cpp | |
parent | 1d8f117069945499ac297ef13eb6a916a2b96d72 (diff) | |
parent | ed72fd0ae98671f1cfce3c975b93e1f760fc40f0 (diff) |
merge
Diffstat (limited to 'indra/llcommon/llerrorthread.cpp')
-rw-r--r-- | indra/llcommon/llerrorthread.cpp | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/indra/llcommon/llerrorthread.cpp b/indra/llcommon/llerrorthread.cpp index 902eaa3b72..950fcd6e83 100644 --- a/indra/llcommon/llerrorthread.cpp +++ b/indra/llcommon/llerrorthread.cpp @@ -112,13 +112,8 @@ void LLErrorThread::run() #if !LL_WINDOWS U32 last_sig_child_count = 0; #endif - while (1) + while (! (LLApp::isError() || LLApp::isStopped())) { - if (LLApp::isError() || LLApp::isStopped()) - { - // The application has stopped running, time to take action (maybe) - break; - } #if !LL_WINDOWS // Check whether or not the main thread had a sig child we haven't handled. U32 current_sig_child_count = LLApp::getSigChildCount(); |