diff options
| author | Steven Bennetts <steve@lindenlab.com> | 2008-06-06 22:43:38 +0000 |
|---|---|---|
| committer | Steven Bennetts <steve@lindenlab.com> | 2008-06-06 22:43:38 +0000 |
| commit | ad332810078a0bbb8fa08fcbfdf3d756de6914f6 (patch) | |
| tree | 1608b2db5d620d323673607ea7ddadfba9d58bda /indra/newview/llfloaterchat.cpp | |
| parent | a7d9a543e587ffe84b355db7a2e8193bfe6c68b6 (diff) | |
QAR-650 - Viewer RC 9 merge -> release (post cmake)
merge release@88802 Branch_1-20-Viewer-2-merge-1@89178 -> release
Diffstat (limited to 'indra/newview/llfloaterchat.cpp')
| -rw-r--r-- | indra/newview/llfloaterchat.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
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); } |