summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAura Linden <aura@lindenlab.com>2014-01-22 10:21:29 -0800
committerAura Linden <aura@lindenlab.com>2014-01-22 10:21:29 -0800
commitd223687fb8f82cc9ede21942a6c7e5c5a4d1ed3d (patch)
treecd98923e840e9b30d435f04630c6db806908db3e
parentace79d97198aeaf8fae0b65fdfa9613b2b3627a6 (diff)
char vs wchar_t FIGHT
-rwxr-xr-xindra/llcommon/llapp.cpp2
-rwxr-xr-xindra/llcommon/llapp.h2
2 files changed, 2 insertions, 2 deletions
diff --git a/indra/llcommon/llapp.cpp b/indra/llcommon/llapp.cpp
index cb06a6a8da..dabed2ba7c 100755
--- a/indra/llcommon/llapp.cpp
+++ b/indra/llcommon/llapp.cpp
@@ -354,7 +354,7 @@ void LLApp::setupErrorHandling()
0,
google_breakpad::ExceptionHandler::HANDLER_ALL,
MiniDumpNormal, //Generate a 'normal' minidump.
- pipe_name.c_str(),
+ wpipe_name.c_str(),
NULL); //No custom client info.
if (mExceptionHandler)
{
diff --git a/indra/llcommon/llapp.h b/indra/llcommon/llapp.h
index c86625b6eb..3349444332 100755
--- a/indra/llcommon/llapp.h
+++ b/indra/llcommon/llapp.h
@@ -31,7 +31,7 @@
#include "llrun.h"
#include "llsd.h"
#include "lloptioninterface.h"
-
+#define LL_SEND_CRASH_REPORTS 1
// Forward declarations
template <typename Type> class LLAtomic32;
typedef LLAtomic32<U32> LLAtomicU32;