summaryrefslogtreecommitdiff
path: root/indra/newview/llappviewer.cpp
diff options
context:
space:
mode:
authorOz Linden <oz@lindenlab.com>2014-04-21 16:21:31 -0400
committerOz Linden <oz@lindenlab.com>2014-04-21 16:21:31 -0400
commitb1a7137ba6e56e1b692205f129d86acc942209e9 (patch)
tree595b9e3a2b9e4be799459e06c9b33793013d0ae0 /indra/newview/llappviewer.cpp
parent32bbb07f0a727b5aa318ba3c32764ec29cc96956 (diff)
parentc71e459bed68c1602d409e5c946c5e016d09d105 (diff)
merge changes for 3.7.6-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 6da8afd8d0..11eaa7d684 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