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

FIRE-11199: Fix merge regression to that broke keyword alerts.

meow-7.2.2
Cinders 2013-07-31 12:35:44 -06:00
parent ac4cbdf2be
commit f3c5ea1672
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
indra/newview/fschathistory.cpp
View File

@ -845,7 +845,7 @@ void FSChatHistory::appendMessage(const LLChat& chat, const LLSD &args, const LL
LLColor4 txt_color = LLUIColorTable::instance().getColor("White");
LLColor4 name_color = LLUIColorTable::instance().getColor("ChatNameColor");
LLViewerChat::getChatColor(chat,txt_color);
LLViewerChat::getChatColor(chat, txt_color, false);
LLFontGL* fontp = LLViewerChat::getChatFont();
std::string font_name = LLFontGL::nameFromFont(fontp);
std::string font_size = LLFontGL::sizeFromFont(fontp);