summaryrefslogtreecommitdiff
path: root/indra/llcommon/llapp.h
diff options
context:
space:
mode:
authorsimon <none@none>2014-04-21 12:36:35 -0700
committersimon <none@none>2014-04-21 12:36:35 -0700
commit0b9a777bfd3c85390c55d91fc3dc5c4bee9bf71b (patch)
treedd3f484813df4f1a74a525f3f6dddcbc91beac7c /indra/llcommon/llapp.h
parente606b7918dc6dbe2a4048f4bbd8590bfc3eca90e (diff)
parentc71e459bed68c1602d409e5c946c5e016d09d105 (diff)
Merge downstream code updating version to 3.7.7
Diffstat (limited to 'indra/llcommon/llapp.h')
-rwxr-xr-xindra/llcommon/llapp.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/llcommon/llapp.h b/indra/llcommon/llapp.h
index 828965b1fa..3f7bf2ca47 100755
--- a/indra/llcommon/llapp.h
+++ b/indra/llcommon/llapp.h
@@ -214,7 +214,7 @@ public:
* DO NOT call this method if your application has specialized
* error handling code.
*/
- void setupErrorHandling();
+ void setupErrorHandling(bool mSecondInstance=false);
void setErrorHandler(LLAppErrorHandler handler);
static void runErrorHandler(); // run shortly after we detect an error, ran in the relatively robust context of the LLErrorThread - preferred.