Remove option of minidump type.

- With Bugsplat this option makes no sense.
- Even with the old minidump processor the option was barely useful.

indra/llcommon/llapp.cpp

@@ -390,10 +390,7 @@ void EnableCrashingOnCrashes()
 }
 #endif
 
-//void LLApp::setupErrorHandling(bool second_instance)
-// [SL:KB] - Patch: Viewer-CrashReporting | Checked: 2010-11-12 (Catznip-2.6.0a) | Added: Catznip-2.4.0a
-void LLApp::setupErrorHandling(bool second_instance, EMiniDumpType minidump_type)
-// [/SL:KB]
+void LLApp::setupErrorHandling(bool second_instance)
 {
 	// Error handling is done by starting up an error handling thread, which just sleeps and
 	// occasionally checks to see if the app is in an error state, and sees if it needs to be run.
@@ -432,23 +429,7 @@ void LLApp::setupErrorHandling(bool second_instance, EMiniDumpType minidump_type
 			for (; retries > 0; --retries)
 			{
 				if (mExceptionHandler != 0) delete mExceptionHandler;
-			// <FS:ND> Reapply patch from Catznip to allow different types of minidumps
-			U32 maskMiniDumpType = MiniDumpNormal | MiniDumpFilterModulePaths;
-			switch (minidump_type)
-			{
-				case MINIDUMP_MINIMAL:
-					maskMiniDumpType |= MiniDumpFilterMemory;
-				break;
-				case MINIDUMP_EXTENDED:
-					maskMiniDumpType |= MiniDumpWithDataSegs | MiniDumpWithIndirectlyReferencedMemory;
-					break;
-				case MINIDUMP_NORMAL:
-				default:
-					break;
-			}
-			// </FS:ND>
-
-
+				U32 maskMiniDumpType = MiniDumpNormal | MiniDumpFilterModulePaths;
 				mExceptionHandler = new google_breakpad::ExceptionHandler(
 															wdump_path,		
 															NULL,		//No filter

indra/llcommon/llapp.h

@@ -226,16 +226,7 @@ public:
 	 * DO NOT call this method if your application has specialized
 	 * error handling code.
 	 */
-//	void setupErrorHandling(bool mSecondInstance=false);
-// [SL:KB] - Patch: Viewer-CrashReporting | Checked: 2010-11-12 (Catznip-2.6.0a) | Added: Catznip-2.4.0a
-	typedef enum minidump_type_t {
-		MINIDUMP_MINIMAL = 0,
-		MINIDUMP_NORMAL = 1,
-		MINIDUMP_EXTENDED = 2
-	} EMiniDumpType;
-
-	void setupErrorHandling(bool second_instance, EMiniDumpType minidump_type = MINIDUMP_NORMAL);
-// [/SL:KB]
+	void setupErrorHandling(bool mSecondInstance=false);
 
 	void setErrorHandler(LLAppErrorHandler handler);
 	static void runErrorHandler(); // run shortly after we detect an error, ran in the relatively robust context of the LLErrorThread - preferred.

indra/newview/llappviewer.cpp

@@ -850,16 +850,7 @@ void fast_exit(int rc)
 
 bool LLAppViewer::init()
 {
-	// <FS:ND> Breakpad merge, setup minidump type from Catznip.
-
-	// setupErrorHandling(mSecondInstance);
-	EMiniDumpType minidump_type = MINIDUMP_NORMAL;
-	if (gSavedSettings.controlExists("SaveMiniDumpType"))
-		minidump_type = (LLApp::EMiniDumpType)gSavedSettings.getU32("SaveMiniDumpType"); 
-
-	setupErrorHandling( mSecondInstance, minidump_type );
-
-	// </FS:ND>
+	setupErrorHandling(mSecondInstance);
 
 	nd::octree::debug::setOctreeLogFilename( gDirUtilp->getExpandedFilename(LL_PATH_LOGS, "octree.log" ) ); // <FS:ND/> Filename to log octree options to.
 	nd::etw::init(); // <FS:ND/> Init event tracing.

indra/newview/llfloaterpreference.cpp

@@ -4955,7 +4955,6 @@ void LLPanelPreferenceCrashReports::refresh()
 	pSendCrashReports->setEnabled(TRUE);
 
 	bool fEnable = pSendCrashReports->get();
-	getChild<LLUICtrl>("comboSaveMiniDumpType")->setEnabled(fEnable);
 	getChild<LLUICtrl>("checkSendCrashReportsAlwaysAsk")->setEnabled(fEnable);
 	getChild<LLUICtrl>("checkSendSettings")->setEnabled(fEnable);
 	getChild<LLUICtrl>("checkSendName")->setEnabled(fEnable);

indra/newview/skins/default/xui/en/panel_preferences_crashreports.xml

@@ -23,43 +23,6 @@
      name="checkSendCrashReports"
      enabled="false" />
 
-    <text
-     layout="topleft"
-     follows="top|left"
-     left="80"
-     top_pad="15"
-     height="10"
-     width="90"
-     mouse_opaque="false"
-     type="string"
-     label="Logs:"
-     name="textSaveMiniDumpType" >
-        Minidump Type:
-    </text>
-    <combo_box
-     layout="topleft"
-     follows="top|left"
-     top_pad="-15"
-     left_pad="10"
-     height="23"
-     width="125"
-     control_name="SaveMinidumpType"
-     name="comboSaveMiniDumpType"
-     enabled="false" >
-        <combo_box.item
-         name="Minimal"
-         label="Minimal"
-         value="0" />
-        <combo_box.item
-         name="Default"
-         label="Default"
-         value="1" />
-        <combo_box.item
-         name="Extended"
-         label="Extended"
-         value="2" />
-    </combo_box>
-
     <check_box
      layout="topleft"
      follows="top|left"