From f9dccaefb56460caab75afcc344927ef70a183db Mon Sep 17 00:00:00 2001
From: Ansariel <none@none>
Date: Fri, 27 Mar 2015 12:55:53 +0100
Subject: [PATCH] FIRE-3572: Customize local chat color brightness change based
 on distance

---
 indra/newview/app_settings/settings.xml         | 11 +++++++++++
 indra/newview/llviewerchat.cpp                  |  6 +++++-
 .../default/xui/de/panel_preferences_colors.xml |  1 +
 .../default/xui/en/panel_preferences_colors.xml | 17 ++++++++++++++++-
 4 files changed, 33 insertions(+), 2 deletions(-)

diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml
index bd76e141b4..912e8abfdf 100644
--- a/indra/newview/app_settings/settings.xml
+++ b/indra/newview/app_settings/settings.xml
@@ -23230,6 +23230,17 @@ Change of this parameter will affect the layout of buttons in notification toast
       <key>Value</key>
       <integer>0</integer>
     </map>
+    <key>FSBeyondNearbyChatColorDiminishFactor</key>
+    <map>
+      <key>Comment</key>
+      <string>The factor the color for nearby chat diminishes if the sender is beyond chat range</string>
+      <key>Persist</key>
+      <integer>1</integer>
+      <key>Type</key>
+      <string>F32</string>
+      <key>Value</key>
+      <real>0.8</real>
+    </map>
   </map>
 </llsd>
 
diff --git a/indra/newview/llviewerchat.cpp b/indra/newview/llviewerchat.cpp
index 34a663fe63..1fda1538f5 100755
--- a/indra/newview/llviewerchat.cpp
+++ b/indra/newview/llviewerchat.cpp
@@ -160,7 +160,11 @@ void LLViewerChat::getChatColor(const LLChat& chat, LLColor4& r_color, LLSD args
 			if (distance_squared > dist_near_chat * dist_near_chat)
 			{
 				// diminish far-off chat
-				r_color.mV[VALPHA] = 0.8f;
+				// <FS:Ansariel> FIRE-3572: Customize local chat color brightness change based on distance
+				//r_color.mV[VALPHA] = 0.8f;
+				static LLCachedControl<F32> fsBeyondNearbyChatColorDiminishFactor(gSavedSettings, "FSBeyondNearbyChatColorDiminishFactor", 0.8f);
+				r_color.mV[VALPHA] = fsBeyondNearbyChatColorDiminishFactor();
+				// </FS:Ansariel>
 			}
 		}
 	}
diff --git a/indra/newview/skins/default/xui/de/panel_preferences_colors.xml b/indra/newview/skins/default/xui/de/panel_preferences_colors.xml
index a167c02c0b..2b69c1cff9 100755
--- a/indra/newview/skins/default/xui/de/panel_preferences_colors.xml
+++ b/indra/newview/skins/default/xui/de/panel_preferences_colors.xml
@@ -50,6 +50,7 @@
 			<text name="object_name_header_label">
 				Objekte
 			</text>
+			<slider label="Abschwächungsfaktor außerhalb Chat-Reichweite:" label_width="275" name="FSBeyondNearbyChatColorDiminishFactor" tool_tip="Faktor, der dafür verwendet wird, die normale Chatfarbe abzuschwächen, wenn sich der Sender außerhalb der normalen Chatreichweite befindet."/>
 			<check_box name="FSColorIMsDistinctly" label="IM/Gruppenchat in Konsole unterschiedlich einfärben:"/>
 			<panel name="im_color_panel">
 				<text name="console_im_label">
diff --git a/indra/newview/skins/default/xui/en/panel_preferences_colors.xml b/indra/newview/skins/default/xui/en/panel_preferences_colors.xml
index b6150e68a5..0b0da1b318 100755
--- a/indra/newview/skins/default/xui/en/panel_preferences_colors.xml
+++ b/indra/newview/skins/default/xui/en/panel_preferences_colors.xml
@@ -494,12 +494,27 @@
      width="95">
      Objects
     </text>
+     <slider
+      control_name="FSBeyondNearbyChatColorDiminishFactor"
+      follows="left|top"
+      height="16"
+      increment="0.05"
+      label="Beyond chat range diminish factor:"
+      layout="topleft"
+      left="30"
+      label_width="200"
+      min_val="0"
+      max_val="1"
+      name="FSBeyondNearbyChatColorDiminishFactor"
+      tool_tip="The factor used to diminish the actual chat color if the sender is beyond normal chat range."
+      top_pad="20"
+      width="450" />
      <check_box
        control_name="FSColorIMsDistinctly"
        follows="left|top"
        layout="topleft"
        left="20"
-       top_pad="24"
+       top_pad="14"
        height="12"
        name="FSColorIMsDistinctly"
        width="450"