diff options
| author | Lynx Linden <lynx@lindenlab.com> | 2010-05-27 15:04:06 +0100 | 
|---|---|---|
| committer | Lynx Linden <lynx@lindenlab.com> | 2010-05-27 15:04:06 +0100 | 
| commit | 05761d785335f08dc176aa6ebb7f0cd45d1298ab (patch) | |
| tree | 0c1fe816d9c7f2e2397a44b60013c005a79b8a2d /indra/llcommon | |
| parent | 4dec1430202d1c5578c4e0a6d4107c88f1050ab3 (diff) | |
Removed the SyncErrorHandler from llapp and llappviewer*.
This was only used for the Linux client to dump a stack trace to
stack_trace.log, which is no longer needed now that we are using
Google Breakpad.
I also removed all of the stack printing code from llappviewerlinux.cpp.
Diffstat (limited to 'indra/llcommon')
| -rw-r--r-- | indra/llcommon/llapp.cpp | 25 | ||||
| -rw-r--r-- | indra/llcommon/llapp.h | 3 | 
2 files changed, 2 insertions, 26 deletions
diff --git a/indra/llcommon/llapp.cpp b/indra/llcommon/llapp.cpp index 6f4acd49b1..da14020f2b 100644 --- a/indra/llcommon/llapp.cpp +++ b/indra/llcommon/llapp.cpp @@ -96,7 +96,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; @@ -334,21 +333,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()  { @@ -371,13 +355,8 @@ 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); -	} +	// set app status to ERROR so that the LLErrorThread notices +	setStatus(APP_STATUS_ERROR);  }  void LLApp::writeMiniDump() diff --git a/indra/llcommon/llapp.h b/indra/llcommon/llapp.h index 7b1144ebf1..a6294a5e1a 100644 --- a/indra/llcommon/llapp.h +++ b/indra/llcommon/llapp.h @@ -231,9 +231,7 @@ public:  	void setupErrorHandling();  	void setErrorHandler(LLAppErrorHandler handler); -	void setSyncErrorHandler(LLAppErrorHandler handler);  	static void runErrorHandler(); // run shortly after we detect an error, ran in the relatively robust context of the LLErrorThread - preferred. -	static void runSyncErrorHandler(); // run IMMEDIATELY when we get an error, ran in the context of the faulting thread.  	//@}  	// @@ -306,7 +304,6 @@ private:  	// their own purposes  	typedef int(*signal_handler_func)(int signum);  	static LLAppErrorHandler sErrorHandler; -	static LLAppErrorHandler sSyncErrorHandler;  	// Default application threads  	LLErrorThread* mThreadErrorp;		// Waits for app to go to status ERROR, then runs the error callback  | 
