From 2ea68ba215565e21667ad1d9ca27a374a2d76636 Mon Sep 17 00:00:00 2001
From: Ansariel <none@none>
Date: Wed, 4 Jan 2012 12:48:33 +0100
Subject: [PATCH] * FIRE-4282: Added option to change colors for chat rings on
 minimap * Changed the default color to something better visible * Chat rings
 now distinguish between chat range and shout range

---
 indra/newview/llnetmap.cpp                    |  5 +-
 indra/newview/skins/default/colors.xml        |  5 +-
 .../xui/de/panel_preferences_colors.xml       |  9 +++
 .../xui/en/panel_preferences_colors.xml       | 78 ++++++++++++++++++-
 4 files changed, 92 insertions(+), 5 deletions(-)

diff --git a/indra/newview/llnetmap.cpp b/indra/newview/llnetmap.cpp
index 1a4ec19c09..17d1027f10 100644
--- a/indra/newview/llnetmap.cpp
+++ b/indra/newview/llnetmap.cpp
@@ -191,7 +191,8 @@ void LLNetMap::draw()
 	static LLUIColor map_track_disabled_color = LLUIColorTable::instance().getColor("MapTrackDisabledColor", LLColor4::white);
 	static LLUIColor map_frustum_color = LLUIColorTable::instance().getColor("MapFrustumColor", LLColor4::white);
 	static LLUIColor map_frustum_rotating_color = LLUIColorTable::instance().getColor("MapFrustumRotatingColor", LLColor4::white);
-	static LLUIColor map_chat_ring_color = LLUIColorTable::instance().getColor("MapChatRingColor", LLColor4::white);
+	static LLUIColor map_chat_ring_color = LLUIColorTable::instance().getColor("MapChatRingColor", LLColor4::yellow);
+	static LLUIColor map_shout_ring_color = LLUIColorTable::instance().getColor("MapShoutRingColor", LLColor4::red);
 	
 	if (mObjectImagep.isNull())
 	{
@@ -558,7 +559,7 @@ void LLNetMap::draw()
 			if(chat_ring)
 			{
 				drawRing(20.0, pos_map, map_chat_ring_color);
-				drawRing(100.0, pos_map, map_chat_ring_color);
+				drawRing(100.0, pos_map, map_shout_ring_color);
 			}
 		}
 
diff --git a/indra/newview/skins/default/colors.xml b/indra/newview/skins/default/colors.xml
index 5fb2efa9ab..a75a746a01 100644
--- a/indra/newview/skins/default/colors.xml
+++ b/indra/newview/skins/default/colors.xml
@@ -734,7 +734,10 @@
      reference="BrickBrown" />
     <color
      name="MapChatRingColor"
-     value="0 0 1 0.1" />
+     value="1 1 0 0.3" />
+    <color
+     name="MapShoutRingColor"
+     value="1 0 0 0.3" />
     <color
      name="MenuBarBgColor"
      reference="DkGray" />
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 0f9f9bcd21..bba59c4516 100644
--- a/indra/newview/skins/default/xui/de/panel_preferences_colors.xml
+++ b/indra/newview/skins/default/xui/de/panel_preferences_colors.xml
@@ -3,7 +3,16 @@
 	<text name="effects_color_textbox">
 		Meine Effekte (Auswahlstrahl):
 	</text>
+	<text name="netmap_color_textbox">
+		Mini-Karte:
+	</text>
 	<color_swatch name="effect_color_swatch" tool_tip="Klicken Sie hier, um die Farbauswahl zu öffnen"/>
+	<text name="netmap_chatring_color_label">
+		Chat-Reichweite
+	</text>
+	<text name="netmap_shoutring_color_label">
+		Ruf-Reichweite
+	</text>
 	<text name="font_colors">
 		Schriftfarben für Chat:
 	</text>
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 008354a643..1e4efe2335 100644
--- a/indra/newview/skins/default/xui/en/panel_preferences_colors.xml
+++ b/indra/newview/skins/default/xui/en/panel_preferences_colors.xml
@@ -21,6 +21,17 @@
     width="200">
     Selection Effects (Particle Beam):
     </text>
+    <text
+    type="string"
+    length="1"
+    follows="left|top"
+    layout="topleft"
+    height="15"
+    left_delta="200"
+    name="netmap_color_textbox"
+    width="100">
+    Minimap:
+    </text>
     <color_swatch
      can_apply_immediately="true"
      follows="left|top"
@@ -29,7 +40,6 @@
      layout="topleft"
      left="40"
      name="effect_color_swatch"
-     tool_tip="Click to open Color Picker"
      width="44">
         <color_swatch.init_callback
          function="Pref.getUIColor"
@@ -40,13 +50,77 @@
         <color_swatch.caption_text
          height="0" />
     </color_swatch>
+    <color_swatch
+     can_apply_immediately="true"
+     follows="left|top"
+     height="24"
+     label_height="0"
+     layout="topleft"
+     left_delta="200"
+     name="netmap_chatring_color_swatch"
+     width="44">
+        <color_swatch.init_callback
+         function="Pref.getUIColor"
+         parameter="MapChatRingColor" />
+        <color_swatch.commit_callback
+         function="Pref.applyUIColor"
+         parameter="MapChatRingColor" />
+        <color_swatch.caption_text
+         height="0" />
+    </color_swatch>
+    <text
+     type="string"
+     length="1"
+     follows="left|top"
+     height="10"
+     layout="topleft"
+     left_pad="5"
+     mouse_opaque="false"
+     name="netmap_chatring_color_label"
+     top_delta="5"
+     width="95">
+        Chat range
+    </text>
+    <color_swatch
+     can_apply_immediately="true"
+     follows="left|top"
+     height="24"
+     label_height="0"
+     layout="topleft"
+     left_delta="100"
+	 top_pad="-15"
+     name="netmap_shoutring_color_swatch"
+     tool_tip="Click to open Color Picker"
+     width="44">
+        <color_swatch.init_callback
+         function="Pref.getUIColor"
+         parameter="MapShoutRingColor" />
+        <color_swatch.commit_callback
+         function="Pref.applyUIColor"
+         parameter="MapShoutRingColor" />
+        <color_swatch.caption_text
+         height="0" />
+    </color_swatch>
+    <text
+     type="string"
+     length="1"
+     follows="left|top"
+     height="10"
+     layout="topleft"
+     left_pad="5"
+     mouse_opaque="false"
+     name="netmap_shoutring_color_label"
+     top_delta="5"
+     width="95">
+        Shout range
+    </text>
     <text
      follows="left|top"
      layout="topleft"
      left="30"
      height="12"
      name="font_colors"
-     top_pad="10"
+     top_pad="20"
      width="120">
         UI Text Colors:
     </text>