diff options
| author | richard <none@none> | 2010-01-15 11:25:10 -0800 |
|---|---|---|
| committer | richard <none@none> | 2010-01-15 11:25:10 -0800 |
| commit | c9cf84913d306103da51dc83e5932ff3fb308d32 (patch) | |
| tree | 9ecb21f9376f29264db9fce33310ffa3a66fc8ab /indra/newview/llnearbychat.cpp | |
| parent | aaef23d7eb1c17ea744fe5737af91b1ed228d416 (diff) | |
| parent | 1d1f51db971271c42d68fa12032d6f85a7e35bd8 (diff) | |
merge
Diffstat (limited to 'indra/newview/llnearbychat.cpp')
| -rw-r--r-- | indra/newview/llnearbychat.cpp | 22 |
1 files changed, 1 insertions, 21 deletions
diff --git a/indra/newview/llnearbychat.cpp b/indra/newview/llnearbychat.cpp index fc0e51b76d..a7c1e73328 100644 --- a/indra/newview/llnearbychat.cpp +++ b/indra/newview/llnearbychat.cpp @@ -179,27 +179,7 @@ void LLNearbyChat::addMessage(const LLChat& chat,bool archive) if (!chat.mMuted) { tmp_chat.mFromName = chat.mFromName; - - if (chat.mChatStyle == CHAT_STYLE_IRC) - { - LLColor4 txt_color = LLUIColorTable::instance().getColor("White"); - LLViewerChat::getChatColor(chat,txt_color); - LLFontGL* fontp = LLViewerChat::getChatFont(); - std::string font_name = LLFontGL::nameFromFont(fontp); - std::string font_size = LLFontGL::sizeFromFont(fontp); - LLStyle::Params append_style_params; - append_style_params.color(txt_color); - append_style_params.readonly_color(txt_color); - append_style_params.font.name(font_name); - append_style_params.font.size(font_size); - append_style_params.font.style = "ITALIC"; - - mChatHistory->appendMessage(chat, use_plain_text_chat_history, append_style_params); - } - else - { - mChatHistory->appendMessage(chat, use_plain_text_chat_history); - } + mChatHistory->appendMessage(chat, use_plain_text_chat_history); } if(archive) |