livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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.
master
Seth ProductEngine 2010-11-11 00:17:59 +02:00
parent 5f099265fc
commit b7afbcbc97
2 changed files with 1 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
indra/newview/llchatitemscontainerctrl.cpp
View File

@ -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);

3
indra/newview/skins/default/colors.xml
View File

@ -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"/>