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.h | |
| parent | c57beb8b4bd51add9a92ddc4d704e7bea9c4d940 (diff) | |
Undid previous commit (bogus merge)
Diffstat (limited to 'indra/llcommon/llapp.h')
| -rw-r--r-- | indra/llcommon/llapp.h | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/indra/llcommon/llapp.h b/indra/llcommon/llapp.h index c5a1546883..c199601c20 100644 --- a/indra/llcommon/llapp.h +++ b/indra/llcommon/llapp.h @@ -190,7 +190,6 @@ public: // Error handling methods // void setErrorHandler(LLAppErrorHandler handler); - void setSyncErrorHandler(LLAppErrorHandler handler); #if !LL_WINDOWS // @@ -247,15 +246,13 @@ protected: private: void setupErrorHandling(); // Do platform-specific error-handling setup (signals, structured exceptions) - 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. + static void runErrorHandler(); // *NOTE: On Windows, we need a routine to reset the structured // exception handler when some evil driver has taken it over for // 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 |