diff options
| author | Oz Linden <oz@lindenlab.com> | 2012-06-28 10:35:22 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2012-06-28 10:35:22 -0400 |
| commit | 764d1e3cafa3e86f1f44a4c2bec0705879b9da38 (patch) | |
| tree | a2ac72c6625c729e73ae6077e790a104c2b598a3 /indra/llcommon/llerrorthread.cpp | |
| parent | ba90a4ec367d47a6876962d7d071cf4615289a11 (diff) | |
| parent | 90547ff411db177bf6424ca553449a81a808fc0f (diff) | |
merge up to 3.3.3-release
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(); |