Removed debugging code.

3 files changed, 2 insertions, 50 deletions

diff --git a/indra/newview/llappviewer.cpp b/indra/newview/llappviewer.cpp
index eaced99c13..307a02b527 100755
--- a/indra/newview/llappviewer.cpp
+++ b/indra/newview/llappviewer.cpp
@@ -3365,7 +3365,7 @@ void LLAppViewer::writeSystemInfo()
 //also didn't see fit to provide a simple query request across the pipe to get this name either.
 //Since we are putting our output in a runtime generated directory and we know the header data in
 //the dump format, we can however use the following hack to identify our file. 
-//SPATTERS TODO make this a member function.
+// TODO make this a member function.
 void getFileList()
 {
 	std::stringstream filenames;
@@ -3403,8 +3403,6 @@ void LLAppViewer::handleViewerCrash()
 
 	llinfos << "Last render pool type: " << LLPipeline::sCurRenderPoolType << llendl ;
 
-	std::cout << "SPATTERS I am here." << std::endl;
-
 	LLMemory::logMemoryInfo(true) ;
 
 	//print out recorded call stacks if there are any.
@@ -3509,7 +3507,6 @@ void LLAppViewer::handleViewerCrash()
 
 	char *minidump_file = pApp->getMiniDumpFilename();
 
-	std::cout << "SPATTERS minidump name is " << minidump_file << std::endl;
 	if(minidump_file && minidump_file[0] != 0)
 	{
 		gDebugInfo["Dynamic"]["MinidumpPath"] = minidump_file;
@@ -3517,7 +3514,6 @@ void LLAppViewer::handleViewerCrash()
 #ifdef LL_WINDOWS
 	getFileList();
 #endif
-	gDebugInfo["Dynamic"]["SPATTERS1"] = "Where my output?"; 
     gDebugInfo["Dynamic"]["CrashType"]="crash";
 	
 	if (gMessageSystem && gDirUtilp)
diff --git a/indra/newview/llappviewerwin32.cpp b/indra/newview/llappviewerwin32.cpp
index c6152574c1..6946130631 100644
--- a/indra/newview/llappviewerwin32.cpp
+++ b/indra/newview/llappviewerwin32.cpp
@@ -269,13 +269,12 @@ int APIENTRY WINMAIN(HINSTANCE hInstance,
 
 	LLAppViewerWin32* viewer_app_ptr = new LLAppViewerWin32(lpCmdLine);
 	
-    // install unexpected exception handler SPATTERS test point
 	gOldTerminateHandler = std::set_terminate(exceptionTerminateHandler);
 
 	viewer_app_ptr->setErrorHandler(LLAppViewer::handleViewerCrash);
 
 #if LL_SEND_CRASH_REPORTS 
-	::SetUnhandledExceptionFilter(catchallCrashHandler);	//SPATTERS test point
+	::SetUnhandledExceptionFilter(catchallCrashHandler);
 #endif
 
 	// Set a debug info flag to indicate if multiple instances are running.
@@ -386,14 +385,6 @@ int APIENTRY WINMAIN(HINSTANCE hInstance,
 		hSession = 0;
 	}
 	
-	/* SPATTERS?
-    // Wait until child process exits.
-    WaitForSingleObject( mCrashReporterProcessInfo.hProcess, 30000 ); //Wait up to 30 seconds for crash report to finish up.
-
-    // Close process and thread handles. 
-    CloseHandle( mCrashReporterProcessInfo.hProcess );
-    CloseHandle( mCrashReporterProcessInfo.hThread );
-	*/
 	return 0;
 }
 
@@ -699,7 +690,6 @@ void LLAppViewerWin32::initCrashReporting(bool reportFreeze)
     std::string logdir = gDirUtilp->getExpandedFilename(LL_PATH_DUMP, "");
     std::string appname = gDirUtilp->getExecutableFilename();
 
-	std::cout << "SPATTERS in init" << std::endl;
 	S32 slen = logdir.length() -1;
 	S32 end = slen;
 	while (logdir.at(end) == '/' || logdir.at(end) == '\\') end--;
@@ -710,38 +700,6 @@ void LLAppViewerWin32::initCrashReporting(bool reportFreeze)
 	}
 	std::string arg_str = "\"" + exe_path + "\" -dumpdir \"" + logdir + "\" -procname \"" + appname + "\" -pid " + pid_str.str(); 
 	_spawnl(_P_NOWAIT, exe_path.c_str(), arg_str.c_str(), NULL);
-	  
-/*	STARTUPINFO         siStartupInfo;
-	
-	std::string arg_str =  "-dumpdir \"" + logdir + "\" -procname \"" + appname + "\" -pid " + pid_str.str(); 
-
-    memset(&siStartupInfo, 0, sizeof(siStartupInfo));
-    memset(&mCrashReporterProcessInfo, 0, sizeof(mCrashReporterProcessInfo));
-
-    siStartupInfo.cb = sizeof(siStartupInfo);
-
-	std::wstring exe_wstr;
-	exe_wstr.assign(exe_path.begin(), exe_path.end());
-
-	std::wstring arg_wstr;
-	arg_wstr.assign(arg_str.begin(), arg_str.end());
-
-    if(CreateProcess(&exe_wstr[0],     
-                     &arg_wstr[0],                 // Application arguments
-                     0,
-                     0,
-                     FALSE,
-                     CREATE_DEFAULT_ERROR_MODE,
-                     0,
-                     0,                              // Working directory
-                     &siStartupInfo,
-                     &mCrashReporterProcessInfo) == FALSE)
-      // Could not start application -> call 'GetLastError()'
-	{
-        //llinfos << "CreateProcess failed " << GetLastError() << llendl;
-        return;
-    }
-	*/
 }
 
 //virtual
diff --git a/indra/newview/llappviewerwin32.h b/indra/newview/llappviewerwin32.h
index 1fb255d7f1..fb37df1a2f 100644
--- a/indra/newview/llappviewerwin32.h
+++ b/indra/newview/llappviewerwin32.h
@@ -55,8 +55,6 @@ protected:
 	virtual bool sendURLToOtherInstance(const std::string& url);
 
 	std::string generateSerialNumber();
-	PROCESS_INFORMATION mCrashReporterProcessInfo;
-
 
 	static const std::string sWindowClass;