diff options
| author | Steven Bennetts <steve@lindenlab.com> | 2008-04-17 02:25:04 +0000 |
|---|---|---|
| committer | Steven Bennetts <steve@lindenlab.com> | 2008-04-17 02:25:04 +0000 |
| commit | d2597d35cf3aeaf0c47a134dfe9119ef7932b98a (patch) | |
| tree | 73c9e027e31810a582dfaeeaae6c51ef7208d6d1 /indra/llcommon/llapp.cpp | |
| parent | c57beb8b4bd51add9a92ddc4d704e7bea9c4d940 (diff) | |
Undid previous commit (bogus merge)
Diffstat (limited to 'indra/llcommon/llapp.cpp')
| -rw-r--r-- | indra/llcommon/llapp.cpp | 24 |
1 files changed, 1 insertions, 23 deletions
diff --git a/indra/llcommon/llapp.cpp b/indra/llcommon/llapp.cpp index d034334aab..067dc4fc43 100644 --- a/indra/llcommon/llapp.cpp +++ b/indra/llcommon/llapp.cpp @@ -78,7 +78,6 @@ BOOL LLApp::sLogInSignal = FALSE; // static LLApp::EAppStatus LLApp::sStatus = LLApp::APP_STATUS_STOPPED; // Keeps track of application status LLAppErrorHandler LLApp::sErrorHandler = NULL; -LLAppErrorHandler LLApp::sSyncErrorHandler = NULL; BOOL LLApp::sErrorThreadRunning = FALSE; #if !LL_WINDOWS LLApp::child_map LLApp::sChildMap; @@ -276,21 +275,6 @@ void LLApp::setErrorHandler(LLAppErrorHandler handler) LLApp::sErrorHandler = handler; } - -void LLApp::setSyncErrorHandler(LLAppErrorHandler handler) -{ - LLApp::sSyncErrorHandler = handler; -} - -// static -void LLApp::runSyncErrorHandler() -{ - if (LLApp::sSyncErrorHandler) - { - LLApp::sSyncErrorHandler(); - } -} - // static void LLApp::runErrorHandler() { @@ -314,13 +298,7 @@ void LLApp::setStatus(EAppStatus status) // static void LLApp::setError() { - if (!isError()) - { - // perform any needed synchronous error-handling - runSyncErrorHandler(); - // set app status to ERROR so that the LLErrorThread notices - setStatus(APP_STATUS_ERROR); - } + setStatus(APP_STATUS_ERROR); } |