From f4d1c26789caf9875aee807b5481848ecd2192ee Mon Sep 17 00:00:00 2001
From: Ansariel <ansariel.hiller@phoenixviewer.com>
Date: Thu, 28 May 2020 14:36:32 +0200
Subject: [PATCH] Add info that any changes to crash submission settings
 require a restart in case of Bugsplat

---
 indra/newview/llfloaterpreference.cpp         |  4 ++++
 .../xui/de/panel_preferences_crashreports.xml |  3 +++
 .../xui/en/panel_preferences_crashreports.xml | 23 +++++++++++++++----
 3 files changed, 26 insertions(+), 4 deletions(-)

diff --git a/indra/newview/llfloaterpreference.cpp b/indra/newview/llfloaterpreference.cpp
index 352240597b..53f1ec7ed9 100644
--- a/indra/newview/llfloaterpreference.cpp
+++ b/indra/newview/llfloaterpreference.cpp
@@ -4857,6 +4857,10 @@ BOOL LLPanelPreferenceCrashReports::postBuild()
 
 	getChild<LLTextBox>("textInformation4")->setTextArg("[URL]", getString("PrivacyPolicyUrl"));
 
+#if LL_SEND_CRASH_REPORTS && defined(LL_BUGSPLAT)
+	childSetVisible("textRestartRequired", true);
+#endif
+
 	refresh();
 
 	return LLPanelPreference::postBuild();
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..8269fd66e2 100644
--- a/indra/newview/skins/default/xui/de/panel_preferences_crashreports.xml
+++ b/indra/newview/skins/default/xui/de/panel_preferences_crashreports.xml
@@ -10,6 +10,9 @@
 	<text name="textSendName">
 		(für eventuelle Rückfragen)
 	</text>
+	<text name="textRestartRequired">
+		Änderungen an jeglichen Einstellungen werden erst nach einem Neustart aktiv.
+	</text>
 	<text name="textInformation1">
 		Sofern nicht ausgewählt, enthalten die Meldungen nur absturzrelevante Informationen.
 	</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..0e074fbe01 100644
--- a/indra/newview/skins/default/xui/en/panel_preferences_crashreports.xml
+++ b/indra/newview/skins/default/xui/en/panel_preferences_crashreports.xml
@@ -52,7 +52,7 @@
      height="20"
      width="230"
      text_color="White_25">
-        (contains Second Life name)
+        (contains username)
     </text>
 
     <check_box
@@ -61,7 +61,7 @@
      left="60"
      top_pad="0"
      height="16"
-     label="Include Second Life name"
+     label="Include username"
      name="checkSendName"
      width="160"
      enabled="false" />
@@ -77,6 +77,21 @@
         (used to ask for additional information if needed)
     </text>
 
+    <text
+     layout="topleft"
+     follows="top|left"
+     left="30"
+     type="string"
+     length="1"
+     height="10"
+     mouse_opaque="false"
+     name="textRestartRequired"
+     top_pad="10"
+     visible="false"
+     width="475">
+        Changes made to any setting require a restart to become effective.
+    </text>
+
     <text
      layout="topleft"
      follows="top|left"
@@ -86,7 +101,7 @@
      height="10"
      mouse_opaque="false"
      name="textInformation1"
-     top_pad="30"
+     top_pad="20"
      width="475">
         Unless checked above crash reports only contain information relevant to the crash.
     </text>
@@ -100,7 +115,7 @@
      mouse_opaque="false"
      name="textInformation2"
      width="475" >
-        Second Life logs are not sent, please review the contents and email separately
+        Logs are not sent, please review the contents and email separately
     </text>
     <text
      layout="topleft"