summaryrefslogtreecommitdiff
path: root/indra/newview/llappviewermacosx.cpp
diff options
context:
space:
mode:
authorOz Linden <oz@lindenlab.com>2017-05-18 15:33:58 -0400
committerOz Linden <oz@lindenlab.com>2017-05-18 15:33:58 -0400
commit013f34ccdd1df275a02e6ca56f8f19b51413b35a (patch)
treee9a88852afc69ef7b4642cb9820e1c31772c1c40 /indra/newview/llappviewermacosx.cpp
parentab3742a2a944ee8535e314ebfad52a980e079a70 (diff)
parent4bf1f1d618d61f0cc2ec0dd22cea7d1c5b909b8f (diff)
merge latest updates from coyot
Diffstat (limited to 'indra/newview/llappviewermacosx.cpp')
-rw-r--r--indra/newview/llappviewermacosx.cpp3
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);
}