diff options
| author | Mark Palange (Mani) <palange@lindenlab.com> | 2009-10-05 13:39:53 -0700 |
|---|---|---|
| committer | Mark Palange (Mani) <palange@lindenlab.com> | 2009-10-05 13:39:53 -0700 |
| commit | 81a63ac0886a31a566535a3483e5013f5bc0b424 (patch) | |
| tree | 1bb0319755a5e26e0bc7f9f20632ae8f31538971 /indra/newview/llimfloater.cpp | |
| parent | 0f5bbec3747f3ff2b1d580506d35dc080fcd1a98 (diff) | |
| parent | 9818f158366a0df980a2e4b9251177d9a9209cfb (diff) | |
merge with latest from lindenlab/svn-imports-viewer-20
Diffstat (limited to 'indra/newview/llimfloater.cpp')
| -rw-r--r-- | indra/newview/llimfloater.cpp | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/indra/newview/llimfloater.cpp b/indra/newview/llimfloater.cpp index d0be581f6d..dde36ac25b 100644 --- a/indra/newview/llimfloater.cpp +++ b/indra/newview/llimfloater.cpp @@ -200,7 +200,6 @@ BOOL LLIMFloater::postBuild() childSetCommitCallback("chat_editor", onSendMsg, this); mHistoryEditor = getChild<LLViewerTextEditor>("im_text"); - mHistoryEditor->setParseHTML(TRUE); setTitle(LLIMModel::instance().getName(mSessionID)); setDocked(true); @@ -361,19 +360,21 @@ void LLIMFloater::updateMessages() if (mLastFromName != from) { message << from << " ----- " << msg["time"].asString(); - mHistoryEditor->appendColoredText(message.str(), false, - prepend_newline, divider_color); + mHistoryEditor->appendText(message.str(), + prepend_newline, LLStyle::Params().color(divider_color) ); message.str(""); mLastFromName = from; } message << msg["message"].asString(); - mHistoryEditor->appendColoredText(message.str(), false, - prepend_newline, chat_color); + mHistoryEditor->appendText(message.str(), + prepend_newline, + LLStyle::Params().color(chat_color) ); message.str(""); mLastMessageIndex = msg["index"].asInteger(); } + mHistoryEditor->blockUndo(); mHistoryEditor->setCursorAndScrollToEnd(); } |