summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorangela <angela@lindenlab.com>2009-11-12 23:02:41 +0800
committerangela <angela@lindenlab.com>2009-11-12 23:02:41 +0800
commitb4a3b65a602ad56baf761a8426093eda585bc572 (patch)
tree9e04603d13e5f4c8a137c6b27af596b8cfe5e4d4
parentf9646bd759f87012fcf59c9ca5822490ec196666 (diff)
fix merge error
-rw-r--r--indra/newview/llchathistory.cpp24
1 files changed, 13 insertions, 11 deletions
diff --git a/indra/newview/llchathistory.cpp b/indra/newview/llchathistory.cpp
index 6d8d11ad2b..2b050f3eb5 100644
--- a/indra/newview/llchathistory.cpp
+++ b/indra/newview/llchathistory.cpp
@@ -338,11 +338,22 @@ void LLChatHistory::appendWidgetMessage(const LLChat& chat)
LLView* view = NULL;
std::string view_text = "\n[" + formatCurrentTime() + "] " + chat.mFromName + ": ";
+
LLInlineViewSegment::Params p;
p.force_newline = true;
p.left_pad = mLeftWidgetPad;
p.right_pad = mRightWidgetPad;
+
+ LLColor4 txt_color = LLUIColorTable::instance().getColor("White");
+ LLViewerChat::getChatColor(chat,txt_color);
+ LLFontGL* fontp = LLViewerChat::getChatFont();
+
+ LLStyle::Params style_params;
+ style_params.color(txt_color);
+ style_params.font(fontp);
+
+
if (mLastFromName == chat.mFromName)
{
view = getSeparator();
@@ -357,6 +368,7 @@ void LLChatHistory::appendWidgetMessage(const LLChat& chat)
else
p.top_pad = mTopHeaderPad;
p.bottom_pad = mBottomHeaderPad;
+
}
p.view = view;
@@ -371,18 +383,8 @@ void LLChatHistory::appendWidgetMessage(const LLChat& chat)
appendWidget(p, view_text, false);
//Append the text message
-
- LLColor4 txt_color = LLUIColorTable::instance().getColor("White");
- LLViewerChat::getChatColor(chat,txt_color);
- LLFontGL* fontp = LLViewerChat::getChatFont();
-
- std::string message = chat.mText + '\n';
-
- LLStyle::Params style_params;
- style_params.color(txt_color);
- style_params.font(fontp);
- appendText(message, FALSE, style_params);
+ appendText(chat.mText, FALSE, style_params);
mLastFromName = chat.mFromName;
blockUndo();