diff options
| author | Aura Linden <aura@lindenlab.com> | 2014-01-16 13:46:08 -0800 |
|---|---|---|
| committer | Aura Linden <aura@lindenlab.com> | 2014-01-16 13:46:08 -0800 |
| commit | 033f0e8ccee111d20a0af5f39909d7b8e76717ac (patch) | |
| tree | 8bf48046c81cfd91c895cfe4c04de236d6ccfca5 /indra | |
| parent | d9b09804910ae47ab4cecdd2cdd6fa2490fa748e (diff) | |
What passess in MSVC may not pass in Teamcity.
Diffstat (limited to 'indra')
| -rwxr-xr-x | indra/llcommon/llapp.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/indra/llcommon/llapp.cpp b/indra/llcommon/llapp.cpp index 3312f6e3b0..cb06a6a8da 100755 --- a/indra/llcommon/llapp.cpp +++ b/indra/llcommon/llapp.cpp @@ -339,7 +339,8 @@ void LLApp::setupErrorHandling() { llwarns << "adding breakpad exception handler" << llendl; - const std::wstring wpipe_name(wstringize(getPid()); + const std::wstring wpipe_name(wstringize(getPid())); + const std::string pipe_name(stringize(wpipe_name)); ::Sleep(3000); //HACK hopefully a static wait won't blow up in my face before google fixes their implementation. @@ -353,7 +354,7 @@ void LLApp::setupErrorHandling() 0, google_breakpad::ExceptionHandler::HANDLER_ALL, MiniDumpNormal, //Generate a 'normal' minidump. - stringize(wpipe_name).c_str(), + pipe_name.c_str(), NULL); //No custom client info. if (mExceptionHandler) { |