summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLynx Linden <lynx@lindenlab.com>2010-05-28 15:40:16 +0100
committerLynx Linden <lynx@lindenlab.com>2010-05-28 15:40:16 +0100
commit590a3d891c138f881d7a3f7c2758e778256e3891 (patch)
treedd830939a14e9d5273e71f9f0a5c6d22440a9ad2
parent4fb77380279bdf853b7f213ba8997511720468dd (diff)
On Windows, you have to pass the minidump path as a wstring.
-rw-r--r--indra/llcommon/llapp.cpp5
1 files changed, 5 insertions, 0 deletions
diff --git a/indra/llcommon/llapp.cpp b/indra/llcommon/llapp.cpp
index 861122a4ac..1ea888f2e0 100644
--- a/indra/llcommon/llapp.cpp
+++ b/indra/llcommon/llapp.cpp
@@ -43,6 +43,7 @@
#include "lllivefile.h"
#include "llmemory.h"
#include "llstl.h" // for DeletePointer()
+#include "llstring.h"
#include "lleventtimer.h"
#include "google_breakpad/exception_handler.h"
@@ -364,7 +365,11 @@ void LLApp::setError()
void LLApp::setMiniDumpDir(const std::string &path)
{
llassert(mExceptionHandler);
+#ifdef LL_WINDOWS
+ mExceptionHandler->set_dump_path(utf8str_to_wstring(path));
+#else
mExceptionHandler->set_dump_path(path);
+#endif
}
void LLApp::writeMiniDump()