summaryrefslogtreecommitdiff
path: root/indra/newview
diff options
context:
space:
mode:
authorLynx Linden <lynx@lindenlab.com>2010-05-26 14:43:27 +0100
committerLynx Linden <lynx@lindenlab.com>2010-05-26 14:43:27 +0100
commita63b6dd93c1ef78e647dbd221a5a3b14ff363102 (patch)
tree61017377079e4677ea0b883cf9dfc8b94fda98d1 /indra/newview
parent6a39149fec72e3a105d7a47b8a9f5aa2a0bfba87 (diff)
Hooked up Google Breakpad for the Linux client too.
Using Alain's Darwin reporter callback was all that was needed. Also replaced the call that exposed the breakpad exception class with a call to just write out the minidump, as that was the only reason for exposing it. Now clients don't need to know about Google Breakpad.
Diffstat (limited to 'indra/newview')
-rw-r--r--indra/newview/llappviewer.cpp8
1 files changed, 5 insertions, 3 deletions
diff --git a/indra/newview/llappviewer.cpp b/indra/newview/llappviewer.cpp
index 7cdd8ca309..0484659793 100644
--- a/indra/newview/llappviewer.cpp
+++ b/indra/newview/llappviewer.cpp
@@ -102,7 +102,6 @@
// Third party library includes
#include <boost/bind.hpp>
-#include <google_breakpad/exception_handler.h>
#if LL_WINDOWS
@@ -2582,7 +2581,10 @@ void LLAppViewer::handleViewerCrash()
gDebugInfo["FirstLogin"] = (LLSD::Boolean) gAgent.isFirstLogin();
gDebugInfo["FirstRunThisInstall"] = gSavedSettings.getBOOL("FirstRunThisInstall");
- if(pApp->minidump_path[0] != 0) gDebugInfo["MinidumpPath"] = pApp->minidump_path;
+ if(pApp->minidump_path[0] != 0)
+ {
+ gDebugInfo["MinidumpPath"] = pApp->minidump_path;
+ }
if(gLogoutInProgress)
{
@@ -3290,7 +3292,7 @@ void LLAppViewer::badNetworkHandler()
"www.secondlife.com/support";
forceDisconnect(message.str());
- LLApp::instance()->getExceptionHandler()->WriteMinidump();
+ LLApp::instance()->writeMiniDump();
}
// This routine may get called more than once during the shutdown process.