From 8a3cdbcd6af557f9e14eb9350c48c77879402d36 Mon Sep 17 00:00:00 2001
From: ziree <none@none>
Date: Fri, 18 Oct 2019 20:19:12 +0200
Subject: [PATCH] Further clarifying the pick radius interface. FIRE-29070

---
 .../xui/en/panel_preferences_colors.xml       | 20 +++++++++++++++----
 .../default/xui/en/panel_preferences_move.xml |  2 +-
 2 files changed, 17 insertions(+), 5 deletions(-)

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 071b8460c9..09d7f11883 100644
--- a/indra/newview/skins/default/xui/en/panel_preferences_colors.xml
+++ b/indra/newview/skins/default/xui/en/panel_preferences_colors.xml
@@ -1237,9 +1237,9 @@
        left="30"
        top_pad="16"
        height="15"
-       name="netmap_pickradius_textbox"
+       name="netmap_pickradius_color_textbox"
        width="115">
-       Pick radius opacity:
+       Pick radius color:
      </text>
      <color_swatch
        color="MapPickRadiusColor"
@@ -1250,6 +1250,7 @@
        layout="topleft"
        left_pad="13"
        name="MapPickRadiusColor"
+       tool_tip="Controls the color of the pick range on the minimap. The size of the pick range can be adjusted with the Pick radius setting."
        top_delta="-5"
        width="44" >
        <color_swatch.init_callback
@@ -1259,6 +1260,18 @@
        function="Pref.applyUIColor"
        parameter="MapPickRadiusColor" />
      </color_swatch>
+     <text
+       type="string"
+       length="1"
+       follows="left|top"
+       layout="topleft"
+       left_pad="10"
+       height="15"
+       name="netmap_pickradius_opacity_textbox"
+       top_delta="5"
+       width="50">
+       Opacity:
+     </text>
      <slider
        can_edit_text="false"
        decimal_digits="2"
@@ -1272,8 +1285,7 @@
        name="MapPickRadiusTransparency"
        show_text="true"
        tool_tip="Controls the opacity of the pick range on the minimap. The size of the pick range can be adjusted with the Pick radius setting."
-       top_delta="5"
-       width="233" />
+       width="173" />
      <text
        type="string"
        length="1"
diff --git a/indra/newview/skins/default/xui/en/panel_preferences_move.xml b/indra/newview/skins/default/xui/en/panel_preferences_move.xml
index 12fc8ada25..44732ac661 100644
--- a/indra/newview/skins/default/xui/en/panel_preferences_move.xml
+++ b/indra/newview/skins/default/xui/en/panel_preferences_move.xml
@@ -881,7 +881,7 @@
          min_val="0.5"
          name="FSMinimapPickScale"
          show_text="true"
-         tool_tip="Controls the radius of the pick range on the minimap. The opacity of the pick range can be adjusted with the Pick radius opacity setting."
+         tool_tip="Controls the radius of the pick range on the minimap. The opacity and color of the pick range can be adjusted with the Pick radius color and Opacity settings."
          width="360"
          top_pad="5"/>