diff options
| author | Aura Linden <aura@lindenlab.com> | 2014-01-15 21:24:55 -0800 |
|---|---|---|
| committer | Aura Linden <aura@lindenlab.com> | 2014-01-15 21:24:55 -0800 |
| commit | 00aa2fee6d3841788d7146e5d6d66d0bceff9c3f (patch) | |
| tree | 18b6f33728d9a6521eab63a9c376b396c13aba49 /indra/win_crash_logger | |
| parent | ea7e6a5174f1bdfc51ada864736d354706534d8b (diff) | |
Fixes from Windows build including utf-16 to utf-8 conversions.
Diffstat (limited to 'indra/win_crash_logger')
| -rw-r--r-- | indra/win_crash_logger/llcrashloggerwindows.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/indra/win_crash_logger/llcrashloggerwindows.cpp b/indra/win_crash_logger/llcrashloggerwindows.cpp index f0bc03a9c4..03a709d757 100644 --- a/indra/win_crash_logger/llcrashloggerwindows.cpp +++ b/indra/win_crash_logger/llcrashloggerwindows.cpp @@ -43,6 +43,7 @@ #include "lldir.h" #include "llsdserialize.h" #include "llsdutil.h" +#include "stringize.h" #include <client/windows/crash_generation/crash_generation_server.h> #include <client/windows/crash_generation/client_info.h> @@ -387,13 +388,12 @@ bool LLCrashLoggerWindows::initCrashServer() //this is unique-enough with least hassle. Worst case for duplicate name //is a second instance of the viewer will not do crash reporting. std::wstring wpipe_name; - wpipe_name = mCrashReportPipeStr + stringize(mPID); + wpipe_name = mCrashReportPipeStr + std::wstring(wstringize(mPID)); - std::wstring wdump_path; - wdump_path = stringize(dump_path); + std::wstring wdump_path( wstringize(dump_path) ); //Pipe naming conventions: http://msdn.microsoft.com/en-us/library/aa365783%28v=vs.85%29.aspx - mCrashHandler = new CrashGenerationServer( stringize(wpipe_name).c_str(), + mCrashHandler = new CrashGenerationServer( wpipe_name, NULL, &LLCrashLoggerWindows::OnClientConnected, this, NULL, NULL, // &LLCrashLoggerWindows::OnClientDumpRequest, this, |