From 1270950f2ebc5ea6d6e80a2f0c3d18d35ba5b33f Mon Sep 17 00:00:00 2001
From: Hecklezz <tj8@live.com.au>
Date: Tue, 22 Apr 2025 05:25:57 +1000
Subject: [PATCH 1/2] Fixes preferences search highlight color by reverting to
 the old behavior of Bg and Font color being linked.

---
 indra/llui/llbutton.cpp                                      | 5 ++++-
 indra/llui/llmenugl.cpp                                      | 5 ++++-
 .../skins/default/xui/en/panel_preferences_colors.xml        | 4 ++--
 3 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/indra/llui/llbutton.cpp b/indra/llui/llbutton.cpp
index d07a0dc159..c66be7d147 100644
--- a/indra/llui/llbutton.cpp
+++ b/indra/llui/llbutton.cpp
@@ -901,7 +901,10 @@ void LLButton::draw()
 
     // Highlight if needed
     if( ll::ui::SearchableControl::getHighlighted() )
-        label_color = ll::ui::SearchableControl::getHighlightFontColor();
+        // <FS> [FIRE-35405] Fix for search highlight color until font color picker is added
+        //label_color = ll::ui::SearchableControl::getHighlightFontColor();
+        label_color = ll::ui::SearchableControl::getHighlightBgColor();
+        // </FS>
 
     // overlay with keyboard focus border
     if (hasFocus())
diff --git a/indra/llui/llmenugl.cpp b/indra/llui/llmenugl.cpp
index 42451bd83f..39abd39bb8 100644
--- a/indra/llui/llmenugl.cpp
+++ b/indra/llui/llmenugl.cpp
@@ -529,7 +529,10 @@ void LLMenuItemGL::draw( void )
 
     // Highlight if needed
     if( ll::ui::SearchableControl::getHighlighted() )
-        color = ll::ui::SearchableControl::getHighlightFontColor();
+        // <FS> [FIRE-35405] Fix for search highlight color until font color picker is added
+        //color = ll::ui::SearchableControl::getHighlightFontColor();
+        color = ll::ui::SearchableControl::getHighlightBgColor();
+        // </FS>
 
     // Draw the text on top.
     if (mBriefItem)
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 b0545f31a9..63e1ee2e35 100644
--- a/indra/newview/skins/default/xui/en/panel_preferences_colors.xml
+++ b/indra/newview/skins/default/xui/en/panel_preferences_colors.xml
@@ -1839,10 +1839,10 @@
      width="44">
         <color_swatch.init_callback
         function="Pref.getUIColor"
-        parameter="SearchableControlHighlightColor" />
+        parameter="SearchableControlHighlightBgColor" />
         <color_swatch.commit_callback
         function="Pref.applyUIColor"
-        parameter="SearchableControlHighlightColor" />
+        parameter="SearchableControlHighlightBgColor" />
      </color_swatch>
 
      <text

From b3fc6c42141daab1c256b93487cdd309ead51f86 Mon Sep 17 00:00:00 2001
From: Hecklezz <tj8@live.com.au>
Date: Thu, 24 Apr 2025 00:10:29 +1000
Subject: [PATCH 2/2] Implemented changing both background and font colours for
 preference search highlighting.

---
 indra/llui/llbutton.cpp                       |  5 +-
 indra/llui/llmenugl.cpp                       |  5 +-
 .../xui/az/panel_preferences_colors.xml       | 13 +++-
 .../xui/de/panel_preferences_colors.xml       | 15 +++--
 .../xui/en/panel_preferences_colors.xml       | 60 +++++++++++++++----
 .../xui/es/panel_preferences_colors.xml       | 11 ++++
 .../xui/fr/panel_preferences_colors.xml       |  7 ++-
 .../xui/it/panel_preferences_colors.xml       | 15 +++--
 .../xui/ja/panel_preferences_colors.xml       | 17 ++++--
 .../xui/pl/panel_preferences_colors.xml       | 15 +++--
 .../xui/ru/panel_preferences_colors.xml       | 13 +++-
 .../xui/zh/panel_preferences_colors.xml       |  7 ++-
 12 files changed, 138 insertions(+), 45 deletions(-)

diff --git a/indra/llui/llbutton.cpp b/indra/llui/llbutton.cpp
index c66be7d147..d07a0dc159 100644
--- a/indra/llui/llbutton.cpp
+++ b/indra/llui/llbutton.cpp
@@ -901,10 +901,7 @@ void LLButton::draw()
 
     // Highlight if needed
     if( ll::ui::SearchableControl::getHighlighted() )
-        // <FS> [FIRE-35405] Fix for search highlight color until font color picker is added
-        //label_color = ll::ui::SearchableControl::getHighlightFontColor();
-        label_color = ll::ui::SearchableControl::getHighlightBgColor();
-        // </FS>
+        label_color = ll::ui::SearchableControl::getHighlightFontColor();
 
     // overlay with keyboard focus border
     if (hasFocus())
diff --git a/indra/llui/llmenugl.cpp b/indra/llui/llmenugl.cpp
index 39abd39bb8..42451bd83f 100644
--- a/indra/llui/llmenugl.cpp
+++ b/indra/llui/llmenugl.cpp
@@ -529,10 +529,7 @@ void LLMenuItemGL::draw( void )
 
     // Highlight if needed
     if( ll::ui::SearchableControl::getHighlighted() )
-        // <FS> [FIRE-35405] Fix for search highlight color until font color picker is added
-        //color = ll::ui::SearchableControl::getHighlightFontColor();
-        color = ll::ui::SearchableControl::getHighlightBgColor();
-        // </FS>
+        color = ll::ui::SearchableControl::getHighlightFontColor();
 
     // Draw the text on top.
     if (mBriefItem)
diff --git a/indra/newview/skins/default/xui/az/panel_preferences_colors.xml b/indra/newview/skins/default/xui/az/panel_preferences_colors.xml
index ccb5a158f9..fd002c1a7a 100644
--- a/indra/newview/skins/default/xui/az/panel_preferences_colors.xml
+++ b/indra/newview/skins/default/xui/az/panel_preferences_colors.xml
@@ -202,9 +202,16 @@
 			<color_swatch name="console_background" tool_tip="Konsol rəngini seçin"/>
 			<slider label="Şəffaflıq:" name="console_background_opacity" tool_tip="Konsol fonunun şəffaflığını seçin"/>
 			<text name="preferences_search_label">
-				Seçim axtarışının rəngi:
-			</text>
-			<color_swatch name="preferences_search_color" tool_tip="Seçim axtarışının rəngini seçin"/>
+                Seçim axtarışının rəngləri:
+            </text>
+			<text name="preferences_search_bg_label" width="35">
+                Fon:
+            </text>
+			<color_swatch name="preferences_search_bg_color" tool_tip="Seçim axtarışının fon rəngini seçin"/>
+			<text name="preferences_search_font_label">
+                Şrift:
+            </text>
+			<color_swatch name="preferences_search_front_color" tool_tip="Seçim axtarışının şrift rəngini seçin"/>
 			<text name="area_search_beacon_color_label">
 				Axtarış zonasının işarənin rəngi:
 			</text>
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 a4c831050d..b97438dbf9 100644
--- a/indra/newview/skins/default/xui/de/panel_preferences_colors.xml
+++ b/indra/newview/skins/default/xui/de/panel_preferences_colors.xml
@@ -201,10 +201,17 @@
 			<slider name="console_background_opacity" label="Deckkraft:" tool_tip="Deckkraft für Konsole auswählen"/>
 			<slider label="Deckkraft für Schwebe-Text:" name="FSHudTextBackgroundOpacity" tool_tip="Deckkraft für Hintergrund von Schwebe-Text festlegen"/>
 			<text name="preferences_search_label">
-				Farbe für Einstellungssuche:
-			</text>
-			<color_swatch name="preferences_search_color" tool_tip="Farbe für die Hervorhebung der Einstellungssuche"/>
-			<text name="area_search_beacon_color_label">
+                Farben für Einstellungssuche:
+            </text>
+			<text name="preferences_search_bg_label" width ="75">
+                Hintergrund:
+            </text>
+			<color_swatch name="preferences_search_bg_color" tool_tip="Hintergrundfarbe für die Hervorhebung der Einstellungssuche"/>
+			<text name="preferences_search_font_label" width="60">
+                Schriftart:
+            </text>
+			<color_swatch name="preferences_search_font_color" tool_tip="Schriftfarbe für die Hervorhebung der Einstellungssuche"/>
+			<text name="area_search_beacon_color_label" left="300">
 				Farbe für Markierung der Umgebungssuche:
 			</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 63e1ee2e35..3ad611d33d 100644
--- a/indra/newview/skins/default/xui/en/panel_preferences_colors.xml
+++ b/indra/newview/skins/default/xui/en/panel_preferences_colors.xml
@@ -1823,8 +1823,19 @@
        height="12"
        name="preferences_search_label"
        top_pad="10"
-       width="220">
-       Preferences Search Highlight Color:
+       width="400">
+       Preferences Search Highlight Colors:
+     </text>
+
+     <text
+       follows="left|top"
+       layout="topleft"
+       left="40"
+       height="12"
+       name="preferences_search_bg_label"
+       top_pad="15"
+       width="80">
+       Background:
      </text>
      <color_swatch
      can_apply_immediately="true"
@@ -1832,10 +1843,10 @@
      height="24"
      label_height="0"
      layout="topleft"
-     left="40"
-     top_pad="5"
-     name="preferences_search_color"
-     tool_tip="Choose preferences search highlight Color"
+     left_pad="10"
+     top_delta="-6"
+     name="preferences_search_bg_color"
+     tool_tip="Choose preferences search highlight Background Color"
      width="44">
         <color_swatch.init_callback
         function="Pref.getUIColor"
@@ -1848,11 +1859,40 @@
      <text
        follows="left|top"
        layout="topleft"
-       left="250"
+       left_pad="20"
+       height="12"
+       name="preferences_search_font_label"
+       top_delta="6"
+       width="40">
+       Font:
+     </text>
+     <color_swatch
+     can_apply_immediately="true"
+     follows="left|top"
+     height="24"
+     label_height="0"
+     layout="topleft"
+     left_pad="10"
+     top_delta="-6"
+     name="preferences_search_font_color"
+     tool_tip="Choose preferences search highlight Font Color"
+     width="44">
+        <color_swatch.init_callback
+        function="Pref.getUIColor"
+        parameter="SearchableControlHighlightFontColor" />
+        <color_swatch.commit_callback
+        function="Pref.applyUIColor"
+        parameter="SearchableControlHighlightFontColor" />
+     </color_swatch>
+
+     <text
+       follows="left|top"
+       layout="topleft"
+       left="340"
        height="12"
        name="area_search_beacon_color_label"
-       top_delta="-17"
-       width="400">
+       top_delta="-21"
+       width="310">
        Area search beacon Color:
      </text>
      <color_swatch
@@ -1861,7 +1901,7 @@
      height="24"
      label_height="0"
      layout="topleft"
-     left="260"
+     left="350"
      top_pad="5"
      name="area_search_beacon_color"
      tool_tip="Choose area search beacon color"
diff --git a/indra/newview/skins/default/xui/es/panel_preferences_colors.xml b/indra/newview/skins/default/xui/es/panel_preferences_colors.xml
index e788ad8f03..5e82574653 100644
--- a/indra/newview/skins/default/xui/es/panel_preferences_colors.xml
+++ b/indra/newview/skins/default/xui/es/panel_preferences_colors.xml
@@ -181,6 +181,17 @@
 			</text>
 			<color_swatch name="console_background" tool_tip="Elige el color de la consola"/>
 			<slider label="Opacidad:" name="console_background_opacity" tool_tip="Configura la opacidad del fondo de la consola"/>
+			<text name="preferences_search_label">
+                Colores de resaltado de búsqueda de preferencias:
+            </text>
+			<text name="preferences_search_bg_label">
+                Fondo:
+            </text>
+			<color_swatch name="preferences_search_bg_color" tool_tip="Seleccione el color de fondo de resaltado de búsqueda de preferencias"/>
+			<text name="preferences_search_font_label" width="60">
+                Fuente:
+            </text>
+			<color_swatch name="preferences_search_font_color" tool_tip="Seleccione el color de fuente de resaltado de búsqueda de preferencias"/>
 			<check_box name="FSScriptDialogNoTransparency" label="Mostrar los diálogos de script siempre sobre fondo opaco"/>
 			<check_box name="FSGroupNotifyNoTransparency" label="Mostrar los avisos de grupo siempre sobre fondo opaco"/>
 			<check_box name="override_pie_color_checkbox" label="Modificar el color y la opacidad del fondo de los manús circulares:"/>
diff --git a/indra/newview/skins/default/xui/fr/panel_preferences_colors.xml b/indra/newview/skins/default/xui/fr/panel_preferences_colors.xml
index 150b14300c..7122c18a21 100644
--- a/indra/newview/skins/default/xui/fr/panel_preferences_colors.xml
+++ b/indra/newview/skins/default/xui/fr/panel_preferences_colors.xml
@@ -101,8 +101,11 @@
 			<slider label="Opacité :" name="console_background_opacity" tool_tip="Ajustez l'opacité du fond de la console"/>
 			<slider label="Opacité du fond du texte flottant :" name="FSHudTextBackgroundOpacity" tool_tip="Ajustez l'opacité de l'arrière-plan du texte flottant"/>
 			<text name="preferences_search_label">Surlignage des préférences recherchées :</text>
-			<color_swatch name="preferences_search_color" tool_tip="Sélectionnez la couleur des préférences surlignées par les résultats de recherche"/>
-			<text name="area_search_beacon_color_label">Couleur de la balise de recherche zonière : </text>
+			<text name="preferences_search_bg_label" width="75">Arrière-plan :</text>
+			<color_swatch name="preferences_search_bg_color" tool_tip="Sélectionnez la couleur d'arrière-plan des préférences surlignées par les résultats de recherche"/>
+			<text name="preferences_search_font_label" width="45">Police :</text>
+			<color_swatch name="preferences_search_font_color" tool_tip="Sélectionnez la couleur de police des préférences surlignées par les résultats de recherche"/>
+			<text name="area_search_beacon_color_label" left="300">Couleur de la balise de recherche zonière : </text>
 			<color_swatch name="area_search_beacon_color" tool_tip="Choix de la couleur de la balise de recherche zonière"/>
 			<text name="notecard_editor_color_label">
 				Couleurs des notices :
diff --git a/indra/newview/skins/default/xui/it/panel_preferences_colors.xml b/indra/newview/skins/default/xui/it/panel_preferences_colors.xml
index 5322171d9d..4039d7a972 100644
--- a/indra/newview/skins/default/xui/it/panel_preferences_colors.xml
+++ b/indra/newview/skins/default/xui/it/panel_preferences_colors.xml
@@ -200,10 +200,17 @@
 		<slider label="Opacità:" name="console_background_opacity" tool_tip="Scegli l'opacità dello sfondo della console"/>
 		<slider label="Opacità sfondo testo fluttuante:" name="FSHudTextBackgroundOpacity" tool_tip="Scegli l'opacità dello sfondo del testo fluttuante" />
 		<text name="preferences_search_label">
-			Risultati di ricerca nelle preferenze:
-		</text>
-		<color_swatch name="preferences_search_color" tool_tip="Scegli il colore"/>
-		<text name="area_search_beacon_color_label">
+            Risultati di ricerca nelle preferenze:
+        </text>
+		<text name="preferences_search_bg_label" width="45">
+            Sfondo:
+        </text>
+		<color_swatch name="preferences_search_bg_color" tool_tip="Scegli il colore di sfondo"/>
+		<text name="preferences_search_font_label" width="60">
+            Carattere:
+        </text>
+		<color_swatch name="preferences_search_font_color" tool_tip="Scegli il colore del carattere"/>
+		<text name="area_search_beacon_color_label" left="260">
 			Raggio di tracciamento (ad es. per Cerca Oggetti):
 		</text>
 		<color_swatch name="area_search_beacon_color" tool_tip="Scegli il colore" />
diff --git a/indra/newview/skins/default/xui/ja/panel_preferences_colors.xml b/indra/newview/skins/default/xui/ja/panel_preferences_colors.xml
index e07aa9f356..bbf04baa62 100644
--- a/indra/newview/skins/default/xui/ja/panel_preferences_colors.xml
+++ b/indra/newview/skins/default/xui/ja/panel_preferences_colors.xml
@@ -235,12 +235,19 @@
 			<color_swatch name="console_background" tool_tip="コンソールの色を選択します。" />
 			<slider label="不透明度:" name="console_background_opacity" tool_tip="チャットコンソールの背景の不透明度を選択します。" />
 			<text name="preferences_search_label">
-				検索結果の強調色:
-			</text>
-			<color_swatch name="preferences_search_color" tool_tip="検索結果を強調する色を選択します" />
+                検索結果の強調色:
+            </text>
+			<text name="preferences_search_bg_label" width="35">
+                背景:
+            </text>
+			<color_swatch name="preferences_search_bg_color" tool_tip="検索結果を強調する背景色を選択します" />
+			<text name="preferences_search_font_label" width="50">
+                フォント:
+            </text>
+			<color_swatch name="preferences_search_font_color" tool_tip="検索結果を強調する文字色を選択します" />
 			<text name="area_search_beacon_color_label">
-				エリアサーチ・ビーコンの色
-			</text>
+                エリアサーチ・ビーコンの色:
+            </text>
 			<color_swatch name="area_search_beacon_color" tool_tip="エリアサーチ・ビーコンの色を選択します" />
 			<check_box name="FSScriptDialogNoTransparency" label="スクリプトからの通知の背景は常に不透明にする" />
 			<check_box name="FSGroupNotifyNoTransparency" label="グループ通知の背景は常に不透明にする" />
diff --git a/indra/newview/skins/default/xui/pl/panel_preferences_colors.xml b/indra/newview/skins/default/xui/pl/panel_preferences_colors.xml
index aedefdad99..c1c35259d2 100644
--- a/indra/newview/skins/default/xui/pl/panel_preferences_colors.xml
+++ b/indra/newview/skins/default/xui/pl/panel_preferences_colors.xml
@@ -198,10 +198,17 @@
 			<slider label="Przezroczystość:" name="console_background_opacity" tool_tip="Wybierz przezroczystość tła konsoli"/>
 			<slider label="Przezrocz. tła tekstu pływającego:" name="FSHudTextBackgroundOpacity" tool_tip="Wybierz przezroczystość tła tekstu pływającego" />
 			<text name="preferences_search_label">
-				Wyniki wyszukiwania w opcjach:
-			</text>
-			<color_swatch name="preferences_search_color" tool_tip="Wybierz kolor dla podświetlenia wyników wyszukiwania w opcjach"/>
-			<text name="area_search_beacon_color_label">
+                Wyniki wyszukiwania w opcjach:
+            </text>
+			<text name="preferences_search_bg_label" width="30">
+                Tło:
+            </text>
+			<color_swatch name="preferences_search_bg_color" tool_tip="Wybierz kolor tła dla podświetlenia wyników wyszukiwania w opcjach"/>
+			<text name="preferences_search_font_label" width="60">
+                Czcionka:
+            </text>
+			<color_swatch name="preferences_search_font_color" tool_tip="Wybierz kolor czcionki dla podświetlenia wyników wyszukiwania w opcjach"/>
+			<text name="area_search_beacon_color_label" left="280">
 				Emiter śledzenia (np. przeszukiwania obszaru):
 			</text>
 			<color_swatch name="area_search_beacon_color" tool_tip="Wybierz kolor emitera śledzenia, np. dla przeszukiwania obszaru" />
diff --git a/indra/newview/skins/default/xui/ru/panel_preferences_colors.xml b/indra/newview/skins/default/xui/ru/panel_preferences_colors.xml
index f6da72911b..202f3e45a1 100644
--- a/indra/newview/skins/default/xui/ru/panel_preferences_colors.xml
+++ b/indra/newview/skins/default/xui/ru/panel_preferences_colors.xml
@@ -203,9 +203,16 @@
 			<slider label="Прозрачность:" name="console_background_opacity" tool_tip="Выберите прозрачность фона консоли"/>
 			<slider label="Прозрачн. фона плав. текста:" name="FSHudTextBackgroundOpacity" tool_tip="Выберите прозрачность фона плавающего текста" />
 			<text name="preferences_search_label">
-				Цвет подсветки поиска в настройках:
-			</text>
-			<color_swatch name="preferences_search_color" tool_tip="Выберите цвет подсветки поиска в настройках"/>
+                Цвета подсветки поиска в настройках:
+            </text>
+			<text name="preferences_search_bg_label" width="35">gi
+                Фон:
+            </text>
+			<color_swatch name="preferences_search_bg_color" tool_tip="Выберите цвет фона подсветки поиска в настройках"/>
+			<text name="preferences_search_font_label" width="50">
+                Шрифт:
+            </text>
+			<color_swatch name="preferences_search_font_color" tool_tip="Выберите цвет шрифта подсветки поиска в настройках"/>
 			<text name="area_search_beacon_color_label">
 				Цвет маяка зоны поиска:
 			</text>
diff --git a/indra/newview/skins/default/xui/zh/panel_preferences_colors.xml b/indra/newview/skins/default/xui/zh/panel_preferences_colors.xml
index 10fdd65c98..d88c118872 100644
--- a/indra/newview/skins/default/xui/zh/panel_preferences_colors.xml
+++ b/indra/newview/skins/default/xui/zh/panel_preferences_colors.xml
@@ -101,7 +101,10 @@
 			<slider label="透明度：" name="console_background_opacity" tool_tip="選擇控制台背景的透明度" />
 			<slider label="懸停文字背景透明度：" name="FSHudTextBackgroundOpacity" tool_tip="設定懸停文字背景的透明度"/>
 			<text name="preferences_search_label">突出顯示搜尋偏好設定：</text>
-			<color_swatch name="preferences_search_color" tool_tip="選擇搜尋結果突出顯示的偏好設定的顏色" />
+			<text name="preferences_search_bg_label" width="35">背景：</text>
+			<color_swatch name="preferences_search_bg_color" tool_tip="選擇搜尋結果突出顯示的偏好設定的背景顏色" />
+			<text name="preferences_search_font_label" width="35">字体：</text>
+			<color_swatch name="preferences_search_font_color" tool_tip="選擇搜尋結果突出顯示的偏好設定的字體顏色" />
 			<text name="area_search_beacon_color_label">區域搜尋標記顏色：</text>
 			<color_swatch name="area_search_beacon_color" tool_tip="選擇區域搜尋標記的顏色" />
 			<text name="notecard_editor_color_label">
@@ -134,4 +137,4 @@
 			</panel>
 		</panel>
 	</tab_container>
-</panel>
\ No newline at end of file
+</panel>