From c57beb8b4bd51add9a92ddc4d704e7bea9c4d940 Mon Sep 17 00:00:00 2001
From: Steven Bennetts <steve@lindenlab.com>
Date: Thu, 17 Apr 2008 02:06:30 +0000
Subject: QAR-449 Viewer 1.20 RC 0 merge Branch_1-20-Viewer -r 84060 : 84432 ->
 release

---
 indra/llcommon/llapp.cpp | 24 +++++++++++++++++++++++-
 1 file changed, 23 insertions(+), 1 deletion(-)

(limited to 'indra/llcommon/llapp.cpp')

diff --git a/indra/llcommon/llapp.cpp b/indra/llcommon/llapp.cpp
index 067dc4fc43..d034334aab 100644
--- a/indra/llcommon/llapp.cpp
+++ b/indra/llcommon/llapp.cpp
@@ -78,6 +78,7 @@ 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;
@@ -275,6 +276,21 @@ 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()
 {
@@ -298,7 +314,13 @@ void LLApp::setStatus(EAppStatus status)
 // static
 void LLApp::setError()
 {
-	setStatus(APP_STATUS_ERROR);
+	if (!isError())
+	{
+		// perform any needed synchronous error-handling
+		runSyncErrorHandler();
+		// set app status to ERROR so that the LLErrorThread notices
+		setStatus(APP_STATUS_ERROR);
+	}
 }
 
 
-- 
cgit v1.3