From 6028ae7b61baa63ad23590d221c4be461b9806ed Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Liru=20F=C3=A6rs?= <lirusaito@gmail.com>
Date: Wed, 1 Apr 2020 01:56:58 -0400
Subject: [PATCH] Fix group notices: Have a background for the header for
 certain skins.

---
 indra/newview/llgroupnotify.cpp              | 5 +++--
 indra/newview/skins/apollo/colors.xml        | 1 +
 indra/newview/skins/dark/colors.xml          | 1 +
 indra/newview/skins/darkgred/colors.xml      | 1 +
 indra/newview/skins/default/colors_base.xml  | 1 +
 indra/newview/skins/emerald/colors.xml       | 1 +
 indra/newview/skins/gemini/colors.xml        | 1 +
 indra/newview/skins/gred/colors.xml          | 1 +
 indra/newview/skins/ruby/colors.xml          | 1 +
 indra/newview/skins/snowwhite/colors.xml     | 1 +
 indra/newview/skins/white_emerald/colors.xml | 1 +
 indra/newview/skins/wisdom/colors.xml        | 1 +
 12 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/indra/newview/llgroupnotify.cpp b/indra/newview/llgroupnotify.cpp
index 96245ea62..c1af61a3c 100644
--- a/indra/newview/llgroupnotify.cpp
+++ b/indra/newview/llgroupnotify.cpp
@@ -150,8 +150,9 @@ LLGroupNotifyBox::LLGroupNotifyBox(const std::string& subject,
 
 	auto links = new LLTextEditor(std::string("group"), LLRect(x, y + 5, RIGHT, bottom), S32_MAX, LLStringUtil::null, nullptr, false, true); // Top adjustment to line up with icon
 	links->setBorderVisible(FALSE);
-	links->setReadOnlyFgColor(text_color);
-	links->setReadOnlyBgColor(LLColor4::transparent);
+	static const auto header_bg_color = gColors.getColor("GroupNotifyHeaderBGColor");
+	if (header_bg_color[VALPHA]) links->setReadOnlyFgColor(text_color);
+	links->setReadOnlyBgColor(header_bg_color);
 	links->setEnabled(false);
 	links->setTakesNonScrollClicks(TRUE);
 	links->setHideScrollbarForShortDocs(TRUE);
diff --git a/indra/newview/skins/apollo/colors.xml b/indra/newview/skins/apollo/colors.xml
index 4e6a35ab6..970076ed3 100644
--- a/indra/newview/skins/apollo/colors.xml
+++ b/indra/newview/skins/apollo/colors.xml
@@ -103,6 +103,7 @@
 <NotifyCautionBoxColor value="254, 209, 118, 255" /> 	<!-- the background color of caution permissions prompts -->
 <NotifyCautionWarnColor value="0, 0, 0, 255" /> 	<!-- the foreground color of the special title text in caution permissions prompts -->
 <GroupNotifyBoxColor value="66, 66, 66, 255" />
+<GroupNotifyHeaderBGColor value="0, 0, 0, 0" />
 <GroupNotifyTextColor value="255, 255, 255, 128" />
 
 <!-- CHAT AND IM HISTORY TEXTBOX COLORS -->
diff --git a/indra/newview/skins/dark/colors.xml b/indra/newview/skins/dark/colors.xml
index c36e5759a..4d9ce08f2 100644
--- a/indra/newview/skins/dark/colors.xml
+++ b/indra/newview/skins/dark/colors.xml
@@ -99,6 +99,7 @@
 <NotifyCautionBoxColor value="254, 209, 118, 255"/>		<!-- the background color of caution permissions prompts -->
 <NotifyCautionWarnColor value="0, 0, 0, 255"/>			<!-- the foreground color of the special title text in caution permissions prompts -->
 <GroupNotifyBoxColor value="66, 66, 66, 255"/>
+<GroupNotifyHeaderBGColor value="0, 0, 0, 0" />
 <GroupNotifyTextColor value="200, 200, 200, 255"/>
 
 <!-- CHAT AND IM HISTORY TEXTBOX COLORS -->
diff --git a/indra/newview/skins/darkgred/colors.xml b/indra/newview/skins/darkgred/colors.xml
index c005b75fc..f79be836e 100644
--- a/indra/newview/skins/darkgred/colors.xml
+++ b/indra/newview/skins/darkgred/colors.xml
@@ -100,6 +100,7 @@
 <NotifyCautionBoxColor value="254, 209, 118, 255" /> 	<!-- the background color of caution permissions prompts -->
 <NotifyCautionWarnColor value="0, 0, 0, 255" /> 	<!-- the foreground color of the special title text in caution permissions prompts -->
 <GroupNotifyBoxColor value="189, 0, 0, 240" />
+<GroupNotifyHeaderBGColor value="0, 0, 0, 0" />
 <GroupNotifyTextColor value="1, 0, 0, 255" />
 
 <!-- CHAT AND IM HISTORY TEXTBOX COLORS -->
diff --git a/indra/newview/skins/default/colors_base.xml b/indra/newview/skins/default/colors_base.xml
index 2e83fe7e3..070fed106 100644
--- a/indra/newview/skins/default/colors_base.xml
+++ b/indra/newview/skins/default/colors_base.xml
@@ -103,6 +103,7 @@
 <NotifyCautionBoxColor value="254, 209, 118, 255" /> 	<!-- the background color of caution permissions prompts -->
 <NotifyCautionWarnColor value="0, 0, 0, 255" /> 	<!-- the foreground color of the special title text in caution permissions prompts -->
 <GroupNotifyBoxColor value="70, 170, 255, 255" />
+<GroupNotifyHeaderBGColor value="255, 255, 255, 184" />
 <GroupNotifyTextColor value="0, 30, 60, 255" />
 
 <!-- CHAT AND IM HISTORY TEXTBOX COLORS -->
diff --git a/indra/newview/skins/emerald/colors.xml b/indra/newview/skins/emerald/colors.xml
index 1b1f3915c..fb42acde0 100644
--- a/indra/newview/skins/emerald/colors.xml
+++ b/indra/newview/skins/emerald/colors.xml
@@ -99,6 +99,7 @@
 <NotifyCautionBoxColor value="0, 0, 0, 255" /> 	<!-- the background color of caution permissions prompts -->
 <NotifyCautionWarnColor value="169, 216, 175, 255" /> 	<!-- the foreground color of the special title text in caution permissions prompts -->
 <GroupNotifyBoxColor value="0, 0, 0, 255" />
+<GroupNotifyHeaderBGColor value="0, 0, 0, 0" />
 <GroupNotifyTextColor value="169, 216, 175, 255" />
 
 <!-- CHAT AND IM HISTORY TEXTBOX COLORS -->
diff --git a/indra/newview/skins/gemini/colors.xml b/indra/newview/skins/gemini/colors.xml
index 54022357a..e759985b8 100644
--- a/indra/newview/skins/gemini/colors.xml
+++ b/indra/newview/skins/gemini/colors.xml
@@ -103,6 +103,7 @@
 <NotifyCautionBoxColor value="254, 209, 118, 255" /> 	<!-- the background color of caution permissions prompts -->
 <NotifyCautionWarnColor value="0, 0, 0, 255" /> 	<!-- the foreground color of the special title text in caution permissions prompts -->
 <GroupNotifyBoxColor value="66, 66, 66, 255" />
+<GroupNotifyHeaderBGColor value="0, 0, 0, 0" />
 <GroupNotifyTextColor value="255, 255, 255, 128" />
 
 <!-- CHAT AND IM HISTORY TEXTBOX COLORS -->
diff --git a/indra/newview/skins/gred/colors.xml b/indra/newview/skins/gred/colors.xml
index 521f3fdb6..05d54fd99 100644
--- a/indra/newview/skins/gred/colors.xml
+++ b/indra/newview/skins/gred/colors.xml
@@ -99,6 +99,7 @@
 <NotifyCautionBoxColor value="254, 209, 118, 255" /> 	<!-- the background color of caution permissions prompts -->
 <NotifyCautionWarnColor value="0, 0, 0, 255" /> 	<!-- the foreground color of the special title text in caution permissions prompts -->
 <GroupNotifyBoxColor value="189, 0, 0, 240" />
+<GroupNotifyHeaderBGColor value="0, 0, 0, 0" />
 <GroupNotifyTextColor value="1, 0, 0, 255" />
 
 <!-- CHAT AND IM HISTORY TEXTBOX COLORS -->
diff --git a/indra/newview/skins/ruby/colors.xml b/indra/newview/skins/ruby/colors.xml
index ae62cfda5..a9f004beb 100644
--- a/indra/newview/skins/ruby/colors.xml
+++ b/indra/newview/skins/ruby/colors.xml
@@ -99,6 +99,7 @@
 <NotifyCautionBoxColor value="254, 209, 118, 255" /> 	<!-- the background color of caution permissions prompts -->
 <NotifyCautionWarnColor value="0, 0, 0, 255" /> 	<!-- the foreground color of the special title text in caution permissions prompts -->
 <GroupNotifyBoxColor value="189, 0, 0, 240" />
+<GroupNotifyHeaderBGColor value="0, 0, 0, 0" />
 <GroupNotifyTextColor value="1, 0, 0, 255" />
 
 <!-- CHAT AND IM HISTORY TEXTBOX COLORS -->
diff --git a/indra/newview/skins/snowwhite/colors.xml b/indra/newview/skins/snowwhite/colors.xml
index 17055d0d2..0f4cdfbd1 100644
--- a/indra/newview/skins/snowwhite/colors.xml
+++ b/indra/newview/skins/snowwhite/colors.xml
@@ -103,6 +103,7 @@
 <NotifyCautionBoxColor value="210, 210, 210, 255" /> 	<!-- the background color of caution permissions prompts -->
 <NotifyCautionWarnColor value="210, 210, 210, 255" /> 	<!-- the foreground color of the special title text in caution permissions prompts -->
 <GroupNotifyBoxColor value="255, 255, 255, 255" />
+<GroupNotifyHeaderBGColor value="0, 0, 0, 0" />
 <GroupNotifyTextColor value="0, 0, 0, 255" />
 
 <!-- CHAT AND IM HISTORY TEXTBOX COLORS -->
diff --git a/indra/newview/skins/white_emerald/colors.xml b/indra/newview/skins/white_emerald/colors.xml
index 566b568fd..591d2dfd8 100644
--- a/indra/newview/skins/white_emerald/colors.xml
+++ b/indra/newview/skins/white_emerald/colors.xml
@@ -99,6 +99,7 @@
 <NotifyCautionBoxColor value="210, 210, 210, 255" /> 	<!-- the background color of caution permissions prompts -->
 <NotifyCautionWarnColor value="210, 210, 210, 255" /> 	<!-- the foreground color of the special title text in caution permissions prompts -->
 <GroupNotifyBoxColor value="255, 255, 255, 255" />
+<GroupNotifyHeaderBGColor value="0, 0, 0, 0" />
 <GroupNotifyTextColor value="0, 0, 0, 255" />
 
 <!-- CHAT AND IM HISTORY TEXTBOX COLORS -->
diff --git a/indra/newview/skins/wisdom/colors.xml b/indra/newview/skins/wisdom/colors.xml
index 8c7047b69..62af3f193 100644
--- a/indra/newview/skins/wisdom/colors.xml
+++ b/indra/newview/skins/wisdom/colors.xml
@@ -103,6 +103,7 @@
 <NotifyCautionBoxColor value="254, 209, 118, 255" />     <!-- the background color of caution permissions prompts -->
 <NotifyCautionWarnColor value="0, 0, 0, 255" />     <!-- the foreground color of the special title text in caution permissions prompts -->
 <GroupNotifyBoxColor value="70, 70, 70, 255" />
+<GroupNotifyHeaderBGColor value="0, 0, 0, 0" />
 <GroupNotifyTextColor value="0, 30, 60, 255" />
 
 <!-- CHAT AND IM HISTORY TEXTBOX COLORS -->