From b7afbcbc97ed06dd6845d3850633f2eda494940c Mon Sep 17 00:00:00 2001
From: Seth ProductEngine <slitovchuk@productengine.com>
Date: Thu, 11 Nov 2010 00:17:59 +0200
Subject: [PATCH] STORM-578 FIXED SLURL to object or user name in nearby chat
toast now uses the font color selected in Preferences->Chat. Removed unused
"ChatToastAgentNameColor" setting from colors.xml.
---
indra/newview/llchatitemscontainerctrl.cpp | 3 +--
indra/newview/skins/default/colors.xml | 3 ---
2 files changed, 1 insertion(+), 5 deletions(-)
diff --git a/indra/newview/llchatitemscontainerctrl.cpp b/indra/newview/llchatitemscontainerctrl.cpp
index d353c809cac..3afddc11450 100644
--- a/indra/newview/llchatitemscontainerctrl.cpp
+++ b/indra/newview/llchatitemscontainerctrl.cpp
@@ -213,7 +213,6 @@ void LLNearbyChatToastPanel::init(LLSD& notification)
{
LLStyle::Params style_params_name;
- LLColor4 userNameColor = LLUIColorTable::instance().getColor("ChatToastAgentNameColor");
std::string href;
if (mSourceType == CHAT_SOURCE_AGENT)
@@ -225,7 +224,7 @@ void LLNearbyChatToastPanel::init(LLSD& notification)
href = LLSLURL("object", mFromID, "inspect").getSLURLString();
}
- style_params_name.color(userNameColor);
+ style_params_name.color(textColor);
std::string font_name = LLFontGL::nameFromFont(messageFont);
std::string font_style_size = LLFontGL::sizeFromFont(messageFont);
diff --git a/indra/newview/skins/default/colors.xml b/indra/newview/skins/default/colors.xml
index ddd2ff196b6..f8660419b40 100644
--- a/indra/newview/skins/default/colors.xml
+++ b/indra/newview/skins/default/colors.xml
@@ -766,9 +766,6 @@
<color
name="SysWellItemSelected"
value="0.3 0.3 0.3 1.0" />
- <color
- name="ChatToastAgentNameColor"
- reference="EmphasisColor" />
<color
name="ColorSwatchBorderColor"
value="0.45098 0.517647 0.607843 1"/>
--
GitLab