diff options
| author | Oz Linden <oz@lindenlab.com> | 2012-06-25 17:16:29 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2012-06-25 17:16:29 -0400 |
| commit | 0f958faacd37461a26af76d34a6b29744a2cd1ec (patch) | |
| tree | 2233d2143c3529a1ffd3b66ee9db5108abeb77f4 /indra/llcommon/llerrorthread.cpp | |
| parent | 1b8bbc7b863ccfc25833dcdbbf0dd9e3e96dc0bb (diff) | |
| parent | eff9be530805298339f656f86a52ade9efeba779 (diff) | |
merge up to 3.3.3-release + pathfinding
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(); |