diff options
| author | Robert Knop <prospero@lindenlab.com> | 2008-12-04 22:36:34 +0000 |
|---|---|---|
| committer | Robert Knop <prospero@lindenlab.com> | 2008-12-04 22:36:34 +0000 |
| commit | 189599b6ff0c4e6b81e761fbc990c057189359f2 (patch) | |
| tree | 1e9e0e91bae9bb1ee53e57ac91cdbbfc9f6dba95 /indra/llcommon/llapp.h | |
| parent | fd46865a502036b9e4414e7ec4950faf551b1f14 (diff) | |
Merging from server/server-1.25 back to trunk.
svn merge -r99446:104838 svn+ssh://svn.lindenlab.com/svn/linden/branches/server/server-1.25
Conflicts resolved by Prospero, except for one scary conflict in
SendConfirmationEmail.php which was resolved by jarv.
Diffstat (limited to 'indra/llcommon/llapp.h')
| -rw-r--r-- | indra/llcommon/llapp.h | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/indra/llcommon/llapp.h b/indra/llcommon/llapp.h index c5a1546883..4142f8ece2 100644 --- a/indra/llcommon/llapp.h +++ b/indra/llcommon/llapp.h @@ -77,6 +77,11 @@ public: LLApp(); virtual ~LLApp(); +protected: + LLApp(LLErrorThread* error_thread); + void commonCtor(); +public: + /** * @brief Return the static app instance if one was created. */ @@ -245,8 +250,9 @@ protected: void stepFrame(); private: + void startErrorThread(); + 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. |