diff options
author | angela <angela@lindenlab.com> | 2009-11-13 15:20:04 +0800 |
---|---|---|
committer | angela <angela@lindenlab.com> | 2009-11-13 15:20:04 +0800 |
commit | a7b8b51a5aabfbe58a904896fb1e7a1c812c2bc6 (patch) | |
tree | f16a6c5c3ffaccab7dedc7c94dcceeed4909a6ee /indra/newview/llimfloater.cpp | |
parent | 9054f31f89963f2f24a6b872fbc6816ee01f0d70 (diff) | |
parent | 01f1eaf7e0faaa3ecde36ac28a346fed53a571fd (diff) |
Automated merge with ssh://angela@hg.lindenlab.com/viewer/viewer-2-0/
Diffstat (limited to 'indra/newview/llimfloater.cpp')
-rw-r--r-- | indra/newview/llimfloater.cpp | 24 |
1 files changed, 2 insertions, 22 deletions
diff --git a/indra/newview/llimfloater.cpp b/indra/newview/llimfloater.cpp index 5ea900e46d..0f32d0b313 100644 --- a/indra/newview/llimfloater.cpp +++ b/indra/newview/llimfloater.cpp @@ -462,7 +462,7 @@ void LLIMFloater::updateMessages() if (messages.size()) { - LLUIColor chat_color = LLUIColorTable::instance().getColor("IMChatColor"); +// LLUIColor chat_color = LLUIColorTable::instance().getColor("IMChatColor"); std::ostringstream message; std::list<LLSD>::const_reverse_iterator iter = messages.rbegin(); @@ -475,32 +475,12 @@ void LLIMFloater::updateMessages() LLUUID from_id = msg["from_id"].asUUID(); std::string from = from_id != gAgentID ? msg["from"].asString() : LLTrans::getString("You"); std::string message = msg["message"].asString(); - LLStyle::Params style_params; - style_params.color(chat_color); LLChat chat; chat.mFromID = from_id; chat.mFromName = from; - //Handle IRC styled /me messages. - std::string prefix = message.substr(0, 4); - if (prefix == "/me " || prefix == "/me'") - { - if (from.size() > 0) - { - style_params.font.style = "ITALIC"; - chat.mText = from + " "; - mChatHistory->appendWidgetMessage(chat, style_params); - } - message = message.substr(3); - style_params.font.style = "UNDERLINE"; - mChatHistory->appendText(message, FALSE, style_params); - } - else - { - chat.mText = message; - mChatHistory->appendWidgetMessage(chat, style_params); - } + mChatHistory->appendWidgetMessage(chat); mLastMessageIndex = msg["index"].asInteger(); } |