diff options
| author | Nat Goodspeed <nat@lindenlab.com> | 2017-02-23 16:54:34 -0500 |
|---|---|---|
| committer | Nat Goodspeed <nat@lindenlab.com> | 2017-02-23 16:54:34 -0500 |
| commit | 1f2fcc12980dd21659bce493431b7a1b3fe2ef00 (patch) | |
| tree | 7a678b096eaa89f655c7e74fb2aacf57b38afe77 /indra/newview/llappviewermacosx.cpp | |
| parent | f0b256b1cb6c96aed81ee456e505247fd2169c5f (diff) | |
| parent | ae0b3149badf369eb2b1f10aba830eef8b4af9b4 (diff) | |
Automated merge with ssh://bitbucket.org/lindenlab/viewer64-c-11
Diffstat (limited to 'indra/newview/llappviewermacosx.cpp')
| -rw-r--r-- | indra/newview/llappviewermacosx.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/indra/newview/llappviewermacosx.cpp b/indra/newview/llappviewermacosx.cpp index bb3bcf2886..d472f8926b 100644 --- a/indra/newview/llappviewermacosx.cpp +++ b/indra/newview/llappviewermacosx.cpp @@ -302,7 +302,8 @@ void LLAppViewerMacOSX::initCrashReporting(bool reportFreeze) std::string appname = gDirUtilp->getExecutableFilename(); std::string str[] = { "-pid", pid_str.str(), "-dumpdir", logdir, "-procname", appname.c_str() }; std::vector< std::string > args( str, str + ( sizeof ( str ) / sizeof ( std::string ) ) ); - LL_WARNS() << "about to launch mac-crash-logger" << pid_str << " " << logdir << " " << appname << LL_ENDL; + LL_WARNS() << "about to launch mac-crash-logger" << pid_str.str() + << " " << logdir << " " << appname << LL_ENDL; launchApplication(&command_str, &args); } |