diff options
| author | Richard Nelson <richard@lindenlab.com> | 2009-10-21 21:30:40 +0000 |
|---|---|---|
| committer | Richard Nelson <richard@lindenlab.com> | 2009-10-21 21:30:40 +0000 |
| commit | b3d1eb82fadbf3a098abb49d2ef23cade4c6fe95 (patch) | |
| tree | 60c0e7fc7897bb9594050262987200027f99cf58 /indra/newview/llchathistory.cpp | |
| parent | a1770db93600d44fff9d0fa6d9637236a01ba352 (diff) | |
fix for chat history layout bugs
EXT-1728 - there is no new line in the text copied on junction of 2 panels
EXT-1670 - fix chat history use of widgets
reviewed by James
Diffstat (limited to 'indra/newview/llchathistory.cpp')
| -rw-r--r-- | indra/newview/llchathistory.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/indra/newview/llchathistory.cpp b/indra/newview/llchathistory.cpp index cc21b636f1..ebf46a6e3f 100644 --- a/indra/newview/llchathistory.cpp +++ b/indra/newview/llchathistory.cpp @@ -101,12 +101,12 @@ void LLChatHistory::appendWidgetMessage(const LLUUID& avatar_id, std::string& fr if (mLastFromName == from) { view = getSeparator(); - view_text = "\n"; + view_text = " "; } else { view = getHeader(avatar_id, from, time); - view_text = from + MESSAGE_USERNAME_DATE_SEPARATOR + time; + view_text = "\n" + from + MESSAGE_USERNAME_DATE_SEPARATOR + time; } //Prepare the rect for the view LLRect target_rect = getDocumentView()->getRect(); @@ -115,12 +115,12 @@ void LLChatHistory::appendWidgetMessage(const LLUUID& avatar_id, std::string& fr view->reshape(target_rect.getWidth(), view->getRect().getHeight()); view->setOrigin(target_rect.mLeft, view->getRect().mBottom); - this->appendWidget(view, view_text, FALSE, TRUE); + appendWidget(view, view_text, FALSE, TRUE, mLeftWidgetPad, 0); //Append the text message - this->appendText(message, TRUE, style_params); + appendText(message, TRUE, style_params); mLastFromName = from; - this->blockUndo(); - this->setCursorAndScrollToEnd(); + blockUndo(); + setCursorAndScrollToEnd(); } |