summaryrefslogtreecommitdiff
path: root/indra/newview/llchatitemscontainerctrl.cpp
diff options
context:
space:
mode:
authorMonroe Linden <monroe@lindenlab.com>2010-12-10 13:22:55 -0800
committerMonroe Linden <monroe@lindenlab.com>2010-12-10 13:22:55 -0800
commite27bcbe0d20c87556b0bcb1e3feaaea6544d3e16 (patch)
tree910dbc7db40ddae4c66ad24e9b25346771500a75 /indra/newview/llchatitemscontainerctrl.cpp
parent95445fb1b56a60145933db0891133230c87274b8 (diff)
parent426744df2c9a6c04bab594fefbd8b35970d0948d (diff)
Merge from viewer-development
Diffstat (limited to 'indra/newview/llchatitemscontainerctrl.cpp')
-rw-r--r--indra/newview/llchatitemscontainerctrl.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/indra/newview/llchatitemscontainerctrl.cpp b/indra/newview/llchatitemscontainerctrl.cpp
index 3afddc1145..899e0431e7 100644
--- a/indra/newview/llchatitemscontainerctrl.cpp
+++ b/indra/newview/llchatitemscontainerctrl.cpp
@@ -224,7 +224,8 @@ void LLNearbyChatToastPanel::init(LLSD& notification)
href = LLSLURL("object", mFromID, "inspect").getSLURLString();
}
- style_params_name.color(textColor);
+ LLColor4 user_name_color = LLUIColorTable::instance().getColor("HTMLLinkColor");
+ style_params_name.color(user_name_color);
std::string font_name = LLFontGL::nameFromFont(messageFont);
std::string font_style_size = LLFontGL::sizeFromFont(messageFont);