diff options
author | dolphin <dolphin@lindenlab.com> | 2014-04-22 16:34:30 -0700 |
---|---|---|
committer | dolphin <dolphin@lindenlab.com> | 2014-04-22 16:34:30 -0700 |
commit | f515e2b1ee601958ba642d638e929daf7ff6e92a (patch) | |
tree | 2622bea403aad589701d7a176d1de59d32af6d77 /indra/newview/llappviewer.cpp | |
parent | 90a42d43b255eca082c283e5a0dfabd4ebfce508 (diff) | |
parent | c71e459bed68c1602d409e5c946c5e016d09d105 (diff) |
Merge with 3.7.6-release
Diffstat (limited to 'indra/newview/llappviewer.cpp')
-rwxr-xr-x | indra/newview/llappviewer.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llappviewer.cpp b/indra/newview/llappviewer.cpp index 5cbce92d2a..1ad3dab564 100755 --- a/indra/newview/llappviewer.cpp +++ b/indra/newview/llappviewer.cpp @@ -741,7 +741,7 @@ public: bool LLAppViewer::init() { - setupErrorHandling(); + setupErrorHandling(mSecondInstance); // // Start of the application |