From 033f0e8ccee111d20a0af5f39909d7b8e76717ac Mon Sep 17 00:00:00 2001
From: Aura Linden <aura@lindenlab.com>
Date: Thu, 16 Jan 2014 13:46:08 -0800
Subject: [PATCH] What passess in MSVC may not pass in Teamcity.
---
indra/llcommon/llapp.cpp | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/indra/llcommon/llapp.cpp b/indra/llcommon/llapp.cpp
index 3312f6e3b0e..cb06a6a8da6 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)
{
--
GitLab