From 2f3b43fc0f8cf74f28d54d2a3cb2a311fbc0f69b Mon Sep 17 00:00:00 2001
From: Rye Mutt <rye@alchemyviewer.org>
Date: Sun, 26 Nov 2023 20:36:32 -0500
Subject: [PATCH] Fix skinning issues with music ticker

---
 indra/newview/skins/alchemy/colors.xml          | 17 ++++++++++-------
 indra/newview/skins/default/colors.xml          | 17 ++++++++++++++++-
 .../skins/default/xui/en/panel_music_ticker.xml | 12 ++++++------
 indra/newview/skins/heretic/colors.xml          | 12 +++++++++---
 indra/newview/skins/ionic/colors.xml            |  9 +++++++++
 5 files changed, 50 insertions(+), 17 deletions(-)

diff --git a/indra/newview/skins/alchemy/colors.xml b/indra/newview/skins/alchemy/colors.xml
index 62dbe959406..05703576481 100644
--- a/indra/newview/skins/alchemy/colors.xml
+++ b/indra/newview/skins/alchemy/colors.xml
@@ -1,8 +1,5 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <colors>
-    <color
-     name="ALMediaTickerOscillatorColor" 
-     reference="AlBlue"/>
     <color
      name="AlBlue"
      value="0 0.631 0.874 1" />
@@ -607,7 +604,7 @@
      reference="Green" />
     <color
      name="MapAvatarFriendColor"
-     reference="Yellow" />
+     reference="AlBlue" />
     <color
      name="MapAvatarLindenColor"
      value="0 1 1 1" />  
@@ -1097,9 +1094,6 @@
   <color
    name="AvatarDefaultColor"
    reference="MapAvatarColor" />
-  <color
-   name="AvatarFriendColor"
-   reference="MapAvatarFriendColor" />
   <color
    name="AvatarLindenColor"
    reference="MapAvatarLindenColor" />
@@ -1154,4 +1148,13 @@
   <color
     name="SearchableControlHighlightColor" 
     reference="AlDangerRed"/>
+  <color
+    name="MusicTickerGridColor" 
+    reference="AlAshGrey"/>
+  <color
+    name="ALMediaTickerOscillatorColor" 
+    reference="AlBlue"/>
+  <color
+    name="MusicTickerEmphasisColor" 
+    reference="AlBlue"/>
 </colors>
diff --git a/indra/newview/skins/default/colors.xml b/indra/newview/skins/default/colors.xml
index c01ea9a755d..6f7490a40a7 100644
--- a/indra/newview/skins/default/colors.xml
+++ b/indra/newview/skins/default/colors.xml
@@ -612,7 +612,10 @@
     <color
      name="MapAvatarSelfColor"
      value="0.53125 0 0.498047 1" />
-    <color
+	<color
+     name="MapAvatarLindenColor"
+     value="0 1 1 1" />
+	<color
      name="MapChatRingColor"
      reference="White_25" />
     <color
@@ -707,6 +710,9 @@
     <color
      name="NameTagFriend"
      value="0.447 0.784 0.663 1" />
+	<color
+     name="NameTagSelf"
+     reference="White" />
     <color
      name="NameTagLegacy"
      reference="White" />
@@ -1128,4 +1134,13 @@
   <color
    name="FriendChatColor"
    reference="White" />
+   <color
+    name="MusicTickerGridColor" 
+    reference="White_50"/>
+   <color
+    name="ALMediaTickerOscillatorColor" 
+    reference="EmphasisColor"/>
+   <color
+    name="MusicTickerEmphasisColor" 
+    reference="EmphasisColor"/>
 </colors>
diff --git a/indra/newview/skins/default/xui/en/panel_music_ticker.xml b/indra/newview/skins/default/xui/en/panel_music_ticker.xml
index cddadcccc5e..74534c32976 100644
--- a/indra/newview/skins/default/xui/en/panel_music_ticker.xml
+++ b/indra/newview/skins/default/xui/en/panel_music_ticker.xml
@@ -24,7 +24,7 @@
     <icon
      top="0"
      bottom="-1"
-     color="AlAshGrey"
+     color="MusicTickerGridColor"
      follows="top|right"
      layout="topleft"
      image_name="Ticker_Grid"
@@ -33,7 +33,7 @@
      name="visualizer_grid"
      width="110" />
     <text
-     text_color="AlBlue"
+     text_color="MusicTickerEmphasisColor"
      bg_visible="false" 
      border_visible="false"
      layout="topleft"
@@ -52,7 +52,7 @@
     </text>
     <icon
      top="20"
-     color="AlAshGrey"
+     color="MusicTickerGridColor"
      follows="left|top|right" 
      height="1"
      layout="topleft"
@@ -62,7 +62,7 @@
      name="ticker_sep1"
      width="244" />
      <text 
-     text_color="AlBlue" 
+     text_color="MusicTickerEmphasisColor" 
      bg_visible="false"
      border_visible="false" 
      layout="topleft"
@@ -98,7 +98,7 @@
     </text>
     <icon
      top="44"
-     color="AlAshGrey"
+     color="MusicTickerGridColor"
      follows="left|top|right" 
      height="1"
      layout="topleft"
@@ -109,7 +109,7 @@
      width="244" 
      />
      <text 
-     text_color="AlBlue" 
+     text_color="MusicTickerEmphasisColor" 
      bg_visible="false"
      border_visible="false" 
      layout="topleft"
diff --git a/indra/newview/skins/heretic/colors.xml b/indra/newview/skins/heretic/colors.xml
index b05ea693445..edfbc0dd7cd 100644
--- a/indra/newview/skins/heretic/colors.xml
+++ b/indra/newview/skins/heretic/colors.xml
@@ -1155,9 +1155,15 @@
   <color
    name="ProfileOnlineIndicatorColor"
    reference="Green" />
-  <color
-   name="ALMediaTickerOscillatorColor"
-   reference="EmphasisColor"/>
+   <color
+    name="MusicTickerGridColor" 
+    reference="White_50"/>
+   <color
+    name="ALMediaTickerOscillatorColor" 
+    reference="EmphasisColor"/>
+   <color
+    name="MusicTickerEmphasisColor" 
+    reference="EmphasisColor"/>
   <color
    name="FriendChatColor"
    reference="White" />
diff --git a/indra/newview/skins/ionic/colors.xml b/indra/newview/skins/ionic/colors.xml
index 09a5253e4a1..538d8706f71 100644
--- a/indra/newview/skins/ionic/colors.xml
+++ b/indra/newview/skins/ionic/colors.xml
@@ -1105,4 +1105,13 @@
    <color
     name="Yellow"
     value="1 1 0 1"/>
+   <color
+    name="MusicTickerGridColor" 
+    reference="White_50"/>
+   <color
+    name="ALMediaTickerOscillatorColor" 
+    reference="EmphasisColor"/>
+   <color
+    name="MusicTickerEmphasisColor" 
+    reference="EmphasisColor"/>
 </colors>
-- 
GitLab