diff options
author | Xiaohong Bao <bao@lindenlab.com> | 2014-04-22 12:19:28 -0600 |
---|---|---|
committer | Xiaohong Bao <bao@lindenlab.com> | 2014-04-22 12:19:28 -0600 |
commit | ae564140c0ff1e05ebfab0752458313da0c07a79 (patch) | |
tree | fc8a1c9828f2baf8a64b8439561d2db99fc12a81 /indra/newview/llappviewer.cpp | |
parent | e36b90539525095101526086db5c0cd282060388 (diff) | |
parent | c71e459bed68c1602d409e5c946c5e016d09d105 (diff) |
Merge
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 1b9d044fe6..3b9259a966 100755 --- a/indra/newview/llappviewer.cpp +++ b/indra/newview/llappviewer.cpp @@ -746,7 +746,7 @@ public: bool LLAppViewer::init() { - setupErrorHandling(); + setupErrorHandling(mSecondInstance); // // Start of the application |