summaryrefslogtreecommitdiff
path: root/indra/llcommon/llapp.h
diff options
context:
space:
mode:
Diffstat (limited to 'indra/llcommon/llapp.h')
-rw-r--r--indra/llcommon/llapp.h8
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.