livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

merge

master
Richard Nelson 2010-03-19 16:03:08 -07:00
parent c7ad3de056 8992f058e0
commit 3dc1bcd6ff
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
indra/newview/llchathistory.cpp
View File

@ -734,7 +734,7 @@ void LLChatHistory::appendMessage(const LLChat& chat, const LLSD &args, const LL
view->reshape(target_rect.getWidth(), view->getRect().getHeight());
view->setOrigin(target_rect.mLeft, view->getRect().mBottom);
std::string widget_associated_text = "\n[" + chat.mTimeStr + "] ";
std::string widget_associated_text = "[" + chat.mTimeStr + "] ";
if (utf8str_trim(chat.mFromName).size() != 0 && chat.mFromName != SYSTEM_FROM)
widget_associated_text += chat.mFromName + delimiter;
@ -834,6 +834,8 @@ void LLChatHistory::appendMessage(const LLChat& chat, const LLSD &args, const LL
{
message = chat.mFromName + message;
}
message += "\n";
mEditor->appendText(message, FALSE, style_params);