summaryrefslogtreecommitdiff
path: root/indra/newview/llchatitemscontainerctrl.cpp
diff options
context:
space:
mode:
authorSeth ProductEngine <slitovchuk@productengine.com>2010-11-11 00:17:59 +0200
committerSeth ProductEngine <slitovchuk@productengine.com>2010-11-11 00:17:59 +0200
commitb7afbcbc97ed06dd6845d3850633f2eda494940c (patch)
tree254abba5aba02fe29673d1fccd54e12f726f1f9d /indra/newview/llchatitemscontainerctrl.cpp
parent5f099265fc36c885122457edd87a1ec8c1a80873 (diff)
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.
Diffstat (limited to 'indra/newview/llchatitemscontainerctrl.cpp')
-rw-r--r--indra/newview/llchatitemscontainerctrl.cpp3
1 files changed, 1 insertions, 2 deletions
diff --git a/indra/newview/llchatitemscontainerctrl.cpp b/indra/newview/llchatitemscontainerctrl.cpp
index d353c809ca..3afddc1145 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);