From ad332810078a0bbb8fa08fcbfdf3d756de6914f6 Mon Sep 17 00:00:00 2001 From: Steven Bennetts Date: Fri, 6 Jun 2008 22:43:38 +0000 Subject: QAR-650 - Viewer RC 9 merge -> release (post cmake) merge release@88802 Branch_1-20-Viewer-2-merge-1@89178 -> release --- indra/newview/llfloaterchat.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'indra/newview/llfloaterchat.cpp') diff --git a/indra/newview/llfloaterchat.cpp b/indra/newview/llfloaterchat.cpp index 3aaa14ab73..fd428990f8 100644 --- a/indra/newview/llfloaterchat.cpp +++ b/indra/newview/llfloaterchat.cpp @@ -207,7 +207,8 @@ void add_timestamped_line(LLViewerTextEditor* edit, const LLChat &chat, const LL { line = line.substr(chat.mFromName.length()); const LLStyleSP &sourceStyle = LLStyleMap::instance().lookup(chat.mFromID); - edit->appendStyledText(chat.mFromName, false, false, &sourceStyle); + edit->appendStyledText(chat.mFromName, false, prepend_newline, &sourceStyle); + prepend_newline = false; } edit->appendColoredText(line, false, prepend_newline, color); } -- cgit v1.2.3