summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMerov Linden <merov@lindenlab.com>2010-12-09 21:04:05 -0800
committerMerov Linden <merov@lindenlab.com>2010-12-09 21:04:05 -0800
commit6af32022cd9bc91584a5ae5cb6ff210f07b722fa (patch)
tree5cb928eeb44c42e0af493d02a315dde02da65c71
parent3e82ab0cc5c96e7c288ed3f93af7644a67a95afa (diff)
parentc389577a0c6bad949bf2bb6ee3ab68f16742138b (diff)
STORM-578 : Pull into viewer-development
-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);