summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLynx Linden <lynx@lindenlab.com>2010-05-28 16:15:00 +0100
committerLynx Linden <lynx@lindenlab.com>2010-05-28 16:15:00 +0100
commit80d9cde59656964335613f99dfa63bb834278416 (patch)
tree7f120e140d20870f47c1fea717e7a21c6fcbca07
parent590a3d891c138f881d7a3f7c2758e778256e3891 (diff)
Try using mbstowcs() to convert to std::wstring.
LLWString cannot be converted to std::wstring, apparently.
-rw-r--r--indra/llcommon/llapp.cpp4
1 files changed, 3 insertions, 1 deletions
diff --git a/indra/llcommon/llapp.cpp b/indra/llcommon/llapp.cpp
index 1ea888f2e0..eedec0b24e 100644
--- a/indra/llcommon/llapp.cpp
+++ b/indra/llcommon/llapp.cpp
@@ -366,7 +366,9 @@ void LLApp::setMiniDumpDir(const std::string &path)
{
llassert(mExceptionHandler);
#ifdef LL_WINDOWS
- mExceptionHandler->set_dump_path(utf8str_to_wstring(path));
+ wchar_t buffer[MAX_MINDUMP_PATH_LENGTH];
+ mbstowcs(buffer, path.c_str(), MAX_MINDUMP_PATH_LENGTH);
+ mExceptionHandler->set_dump_path(std::wstring(buffer));
#else
mExceptionHandler->set_dump_path(path);
#endif