From fd0c852458a2c560b0bc33b958ef9ab7e36dfe7f Mon Sep 17 00:00:00 2001
From: Liny <liny@pinkfox.xyz>
Date: Fri, 7 Sep 2018 03:51:52 -0700
Subject: [PATCH] FIRE-22732: Add the ability to change the color of the area
 search beacon.

---
 indra/newview/fsareasearch.cpp                |  9 ++----
 indra/newview/fsareasearch.h                  |  2 --
 indra/newview/skins/default/colors.xml        |  3 ++
 .../xui/en/panel_preferences_colors.xml       | 29 +++++++++++++++++++
 4 files changed, 35 insertions(+), 8 deletions(-)

diff --git a/indra/newview/fsareasearch.cpp b/indra/newview/fsareasearch.cpp
index 53feb7e547..b54db831f2 100644
--- a/indra/newview/fsareasearch.cpp
+++ b/indra/newview/fsareasearch.cpp
@@ -143,8 +143,6 @@ FSAreaSearch::FSAreaSearch(const LLSD& key) :
 	mFilterPermModify(false),
 	mFilterPermTransfer(false),
 	mFilterAgentParcelOnly(false),
-	mBeaconColor(),
-	mBeaconTextColor(),
 	mBeacons(false),
 	mExcludeAttachment(true),
 	mExcludeTemporary(true),
@@ -197,10 +195,7 @@ BOOL FSAreaSearch::postBuild()
 			mTab->removeTabPanel(advanced_tab);
 		}
 	}
-
-	// TODO: add area search settings to the color.xml file
-	mBeaconColor = LLUIColorTable::getInstance()->getColor("PathfindingLinksetBeaconColor");
-	mBeaconTextColor = LLUIColorTable::getInstance()->getColor("PathfindingDefaultBeaconTextColor");
+	
 
 	return LLFloater::postBuild();
 }
@@ -215,6 +210,8 @@ void FSAreaSearch::draw()
 	LLFloater::draw();
 	
 	static LLCachedControl<S32> beacon_line_width(gSavedSettings, "DebugBeaconLineWidth");
+	static LLUIColor mBeaconColor = LLUIColorTable::getInstance()->getColor("AreaSearchBeaconColor");
+	static LLUIColor mBeaconTextColor = LLUIColorTable::getInstance()->getColor("PathfindingDefaultBeaconTextColor");
 	
 	if (mBeacons)
 	{
diff --git a/indra/newview/fsareasearch.h b/indra/newview/fsareasearch.h
index 04f1205813..c552208567 100644
--- a/indra/newview/fsareasearch.h
+++ b/indra/newview/fsareasearch.h
@@ -223,8 +223,6 @@ private:
 	FSPanelAreaSearchAdvanced* mPanelAdvanced;
 
 	bool mBeacons;
-	LLColor4 mBeaconColor;
-	LLColor4 mBeaconTextColor;
 	
 	bool mExcludeAttachment;
 	bool mExcludeTemporary;
diff --git a/indra/newview/skins/default/colors.xml b/indra/newview/skins/default/colors.xml
index f27b3b0b92..d5851a21fa 100644
--- a/indra/newview/skins/default/colors.xml
+++ b/indra/newview/skins/default/colors.xml
@@ -1333,4 +1333,7 @@
   <color
       name="ChatHistoryMessageFromLog"
       reference="Gray" />
+  <color
+      name="AreaSearchBeaconColor"
+      reference="Blue_80" />
 </colors>
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 56c4877692..28a007a3a5 100644
--- a/indra/newview/skins/default/xui/en/panel_preferences_colors.xml
+++ b/indra/newview/skins/default/xui/en/panel_preferences_colors.xml
@@ -1800,6 +1800,35 @@
         parameter="SearchableControlHighlightColor" />
      </color_swatch>
 
+     <text
+       follows="left|top"
+       layout="topleft"
+       left="30"
+       height="12"
+       name="preferences_search_label"
+       top_pad="15"
+       width="220">
+       Area search beacon Color:
+     </text>
+     <color_swatch
+     can_apply_immediately="true"
+     follows="left|top"
+     height="24"
+     label_height="0"
+     layout="topleft"
+     left="40"
+     top_pad="5"
+     name="area_search_beacon_color"
+     tool_tip="Choose area search beacon color"
+     width="44">
+        <color_swatch.init_callback
+        function="Pref.getUIColor"
+        parameter="AreaSearchBeaconColor" />
+        <color_swatch.commit_callback
+        function="Pref.applyUIColor"
+        parameter="AreaSearchBeaconColor" />
+     </color_swatch>
+
      <check_box
      control_name="FSScriptDialogNoTransparency"
      follows="left|top"