diff options
| author | Vadim Savchuk <vsavchuk@productengine.com> | 2009-10-28 15:50:36 +0200 |
|---|---|---|
| committer | Vadim Savchuk <vsavchuk@productengine.com> | 2009-10-28 15:50:36 +0200 |
| commit | 2663bad36b4b02003b4b4c5989c2571c71504cd7 (patch) | |
| tree | e0d301fabee6da382f55a86e06db4c466d5a4011 /indra/newview/llchathistory.cpp | |
| parent | 2bb9751d0aee01b8911f57150fb1e5ea258d7bb4 (diff) | |
| parent | ea5a60c80f0243a7e5a6a7fd8357e7c3cd6b5d4d (diff) | |
merge from default
--HG--
branch : product-engine
Diffstat (limited to 'indra/newview/llchathistory.cpp')
| -rw-r--r-- | indra/newview/llchathistory.cpp | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/indra/newview/llchathistory.cpp b/indra/newview/llchathistory.cpp index 512773d215..38e8985188 100644 --- a/indra/newview/llchathistory.cpp +++ b/indra/newview/llchathistory.cpp @@ -299,12 +299,12 @@ void LLChatHistory::appendWidgetMessage(const LLChat& chat, LLStyle::Params& sty if (mLastFromName == chat.mFromName) { view = getSeparator(); - view_text = " "; + view_text = "\n"; } else { view = getHeader(chat); - view_text = "\n" + chat.mFromName + MESSAGE_USERNAME_DATE_SEPARATOR + formatCurrentTime(); + view_text = chat.mFromName + MESSAGE_USERNAME_DATE_SEPARATOR + formatCurrentTime() + '\n'; } //Prepare the rect for the view LLRect target_rect = getDocumentView()->getRect(); @@ -316,7 +316,8 @@ void LLChatHistory::appendWidgetMessage(const LLChat& chat, LLStyle::Params& sty appendWidget(view, view_text, FALSE, TRUE, mLeftWidgetPad, 0); //Append the text message - appendText(chat.mText, TRUE, style_params); + std::string message = chat.mText + '\n'; + appendText(message, FALSE, style_params); mLastFromName = chat.mFromName; blockUndo(); |