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 Value 0 + FSBeyondNearbyChatColorDiminishFactor + + Comment + The factor the color for nearby chat diminishes if the sender is beyond chat range + Persist + 1 + Type + F32 + Value + 0.8 + 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; + // FIRE-3572: Customize local chat color brightness change based on distance + //r_color.mV[VALPHA] = 0.8f; + static LLCachedControl fsBeyondNearbyChatColorDiminishFactor(gSavedSettings, "FSBeyondNearbyChatColorDiminishFactor", 0.8f); + r_color.mV[VALPHA] = fsBeyondNearbyChatColorDiminishFactor(); + // } } } 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 @@ Objekte + 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 +