summaryrefslogtreecommitdiff
path: root/indra/llcommon/llapp.h
diff options
context:
space:
mode:
authorMerov Linden <merov@lindenlab.com>2014-04-22 13:32:15 -0700
committerMerov Linden <merov@lindenlab.com>2014-04-22 13:32:15 -0700
commitf6bb6a0f935323434a3f3d0d94e94c8d8238effe (patch)
tree81945284f515f25ce23284077b1e07f500ad64ff /indra/llcommon/llapp.h
parentc79abac5ad5d41f86655883fd9f3ec6a108967a7 (diff)
parentc71e459bed68c1602d409e5c946c5e016d09d105 (diff)
Pull merge from lindenlab/viewer-release
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.