From 60dc71dda3953da44e9336d3082e372753dc45c5 Mon Sep 17 00:00:00 2001
From: Ansariel <ansariel.hiller@phoenixviewer.com>
Date: Tue, 26 May 2020 22:15:08 +0200
Subject: [PATCH] Only send per account settings file if user opted in to send
 settings files

---
 indra/newview/llappviewerwin32.cpp                    | 11 +++++++++--
 .../default/xui/de/panel_preferences_crashreports.xml |  2 +-
 .../default/xui/en/panel_preferences_crashreports.xml |  2 +-
 3 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/indra/newview/llappviewerwin32.cpp b/indra/newview/llappviewerwin32.cpp
index 2e282d6800..78b758a1b0 100644
--- a/indra/newview/llappviewerwin32.cpp
+++ b/indra/newview/llappviewerwin32.cpp
@@ -172,8 +172,15 @@ namespace
                 }
                 // </FS:ND>
 
-                sBugSplatSender->sendAdditionalFile(
-                    WCSTR(gDirUtilp->getExpandedFilename(LL_PATH_PER_SL_ACCOUNT, "settings_per_account.xml")));
+                //<FS:Ansariel> Only include if sending settings file
+                //sBugSplatSender->sendAdditionalFile(
+                //    WCSTR(gDirUtilp->getExpandedFilename(LL_PATH_PER_SL_ACCOUNT, "settings_per_account.xml")));
+                if (gCrashSettings.getBOOL("CrashSubmitSettings"))
+                {
+                    sBugSplatSender->sendAdditionalFile(
+                        WCSTR(gDirUtilp->getExpandedFilename(LL_PATH_PER_SL_ACCOUNT, "settings_per_account.xml")));
+                }
+                // <FS:Ansariel>
             }
 
             // LL_ERRS message, when there is one
diff --git a/indra/newview/skins/default/xui/de/panel_preferences_crashreports.xml b/indra/newview/skins/default/xui/de/panel_preferences_crashreports.xml
index d15b516e78..b28d52f539 100644
--- a/indra/newview/skins/default/xui/de/panel_preferences_crashreports.xml
+++ b/indra/newview/skins/default/xui/de/panel_preferences_crashreports.xml
@@ -2,7 +2,7 @@
 <panel label="Absturzmeldungen" name="crash_reports">
 	<check_box label="Absturzmeldungen an firestormviewer.org senden" name="checkSendCrashReports"/>
 	<check_box label="Vor dem Senden immer fragen" name="checkSendCrashReportsAlwaysAsk"/>
-	<check_box label="Firestorm-Konfigurationsdatei settings.xml einschließen" name="checkSendSettings"/>
+	<check_box label="Firestorm-Konfigurationsdateien einschließen" name="checkSendSettings"/>
 	<text name="textSendSettings">
 		(enthält Benutzername)
 	</text>
diff --git a/indra/newview/skins/default/xui/en/panel_preferences_crashreports.xml b/indra/newview/skins/default/xui/en/panel_preferences_crashreports.xml
index cae43db347..5b362348b2 100644
--- a/indra/newview/skins/default/xui/en/panel_preferences_crashreports.xml
+++ b/indra/newview/skins/default/xui/en/panel_preferences_crashreports.xml
@@ -39,7 +39,7 @@
      follows="top|left"
      top_pad="5"
      height="16"
-     label="Include settings.xml"
+     label="Include settings files"
      name="checkSendSettings"
      width="130"
      enabled="false" />