From 81fa147450ae84b4c6f1b5d42be28f35538dc89b Mon Sep 17 00:00:00 2001
From: Latif Khalifa <latifer@streamgrid.net>
Date: Tue, 1 Oct 2013 21:47:12 +0200
Subject: [PATCH] Breakpad: don't fork logger process on startup. Use
 singularity-debug as the dir for dumps

---
 indra/llvfs/lldir.cpp              | 3 +++
 indra/newview/llappviewerwin32.cpp | 2 ++
 2 files changed, 5 insertions(+)

diff --git a/indra/llvfs/lldir.cpp b/indra/llvfs/lldir.cpp
index 551338fa6..bb35c4fe4 100644
--- a/indra/llvfs/lldir.cpp
+++ b/indra/llvfs/lldir.cpp
@@ -283,12 +283,15 @@ const std::string &LLDir::getDumpDir() const
 {
     if (sDumpDir.empty() )
     {
+		/* Singu Note: don't generate a different dump dir each time
         LLUUID uid;
         uid.generate();
         
         sDumpDir = gDirUtilp->getExpandedFilename(LL_PATH_LOGS, "")
                     + "dump-" + uid.asString();
+		*/
 
+		sDumpDir = gDirUtilp->getExpandedFilename(LL_PATH_LOGS, "") + "singularity-debug";
         dir_exists_or_crash(sDumpDir);  
     }
 
diff --git a/indra/newview/llappviewerwin32.cpp b/indra/newview/llappviewerwin32.cpp
index 3be747d63..5758fb5c4 100644
--- a/indra/newview/llappviewerwin32.cpp
+++ b/indra/newview/llappviewerwin32.cpp
@@ -522,6 +522,7 @@ bool LLAppViewerWin32::restoreErrorTrap()
 
 void LLAppViewerWin32::initCrashReporting(bool reportFreeze)
 {
+	/* Singu Note: don't fork the crash logger on start
 	const char* logger_name = "win_crash_logger.exe";
 	std::string exe_path = gDirUtilp->getExecutableDir();
 	exe_path += gDirUtilp->getDirDelimiter();
@@ -543,6 +544,7 @@ void LLAppViewerWin32::initCrashReporting(bool reportFreeze)
 	std::string arg_str = "\"" + exe_path + "\" -dumpdir \"" + logdir + "\" -procname \"" + appname + "\" -pid " + pid_str.str(); 
 	llinfos << "spawning " << arg_str << llendl;
 	_spawnl(_P_NOWAIT, exe_path.c_str(), arg_str.c_str(), NULL);
+	*/
 	  
 /*	STARTUPINFO         siStartupInfo;