diff options
| -rw-r--r-- | indra/newview/llchatitemscontainerctrl.cpp | 3 | ||||
| -rw-r--r-- | indra/newview/skins/default/colors.xml | 3 | 
2 files changed, 1 insertions, 5 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); diff --git a/indra/newview/skins/default/colors.xml b/indra/newview/skins/default/colors.xml index ddd2ff196b..f8660419b4 100644 --- a/indra/newview/skins/default/colors.xml +++ b/indra/newview/skins/default/colors.xml @@ -767,9 +767,6 @@       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"/>      <color  | 
