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

FIRE-12103: Group moderator name highlighting is using message body format option

Ansariel 2014-09-26 17:58:06 +02:00
parent 7552e9d735
commit 293964e2de
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
indra/newview/fschathistory.cpp
View File

@ -1030,7 +1030,7 @@ void FSChatHistory::appendMessage(const LLChat& chat, const LLSD &args, const LL
{
moderator_style_active = true;
name_params.font.style(moderator_name_style);
name_params.font.style(moderator_name_style);
body_message_params.font.style(moderator_body_style);
if ( irc_me && gSavedSettings.getBOOL("EmotesUseItalic") )
@ -1038,7 +1038,7 @@ void FSChatHistory::appendMessage(const LLChat& chat, const LLSD &args, const LL
if ( (ITALIC & moderator_name_style_value) != ITALIC )//HG: if ITALIC isn't one of the styles... add it
{
moderator_name_style += "ITALIC";
body_message_params.font.style(moderator_name_style);
name_params.font.style(moderator_name_style);
}
if ( (ITALIC & moderator_body_style_value) != ITALIC )
{
@ -1130,7 +1130,6 @@ void FSChatHistory::appendMessage(const LLChat& chat, const LLSD &args, const LL
else if (chat.mFromName != SYSTEM_FROM && chat.mFromID.notNull() && !message_from_log && !chat.mRlvNamesFiltered)
// [/RLVa:KB]
{
LLStyle::Params name_params(body_message_params);
name_params.color = name_color;
name_params.readonly_color = name_color;
if (chat.mChatType == CHAT_TYPE_IM || chat.mChatType == CHAT_TYPE_IM_GROUP)