summaryrefslogtreecommitdiff
path: root/indra/llcommon/llapp.h
diff options
context:
space:
mode:
authorBrad Payne (Vir Linden) <vir@lindenlab.com>2014-04-22 11:19:58 -0400
committerBrad Payne (Vir Linden) <vir@lindenlab.com>2014-04-22 11:19:58 -0400
commitd0eb9658f2698b9c200991e84c1a60be48788e2c (patch)
treedaadf5ce47cf869d3b9937cb834b0fb63539853a /indra/llcommon/llapp.h
parentea7f34d37ac1861fc1e48e11ca5030e424a05a85 (diff)
parentc71e459bed68c1602d409e5c946c5e016d09d105 (diff)
merge
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.