summaryrefslogtreecommitdiff
path: root/indra/newview/llappviewer.cpp
diff options
context:
space:
mode:
authorCallum Prentice <callum@lindenlab.com>2014-04-23 12:47:23 -0700
committerCallum Prentice <callum@lindenlab.com>2014-04-23 12:47:23 -0700
commit1953c569a6acfd731af2c459da7a6928be4aaf5b (patch)
treef5e66a37eed56d418ad3fab290645a8ce4da943f /indra/newview/llappviewer.cpp
parent8fd239233dca9639c6d0139e8f697da97bfe036e (diff)
parentc71e459bed68c1602d409e5c946c5e016d09d105 (diff)
Merge with viewer-release
Diffstat (limited to 'indra/newview/llappviewer.cpp')
-rwxr-xr-xindra/newview/llappviewer.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llappviewer.cpp b/indra/newview/llappviewer.cpp
index 63d31824e4..413a0abf47 100755
--- a/indra/newview/llappviewer.cpp
+++ b/indra/newview/llappviewer.cpp
@@ -740,7 +740,7 @@ public:
bool LLAppViewer::init()
{
- setupErrorHandling();
+ setupErrorHandling(mSecondInstance);
//
// Start of the application