diff options
| author | James Cook <james@lindenlab.com> | 2009-11-18 14:33:09 -0800 |
|---|---|---|
| committer | James Cook <james@lindenlab.com> | 2009-11-18 14:33:09 -0800 |
| commit | 5649faf6d9202ba0b631262eee669fba926f010b (patch) | |
| tree | 490b32d5ae2cd140ee0eb464431e95c062e16e0e | |
| parent | de23a4d92c02504fd512b2fdb151406d31ae03c0 (diff) | |
| parent | 203490e2a0915c5ce59ccacba420388327f9143b (diff) | |
merge
| -rw-r--r-- | indra/newview/llchatitemscontainerctrl.cpp | 12 | ||||
| -rw-r--r-- | indra/newview/llimfloater.cpp | 4 | ||||
| -rw-r--r-- | indra/newview/llnearbychat.cpp | 2 | ||||
| -rw-r--r-- | indra/newview/lltoastimpanel.cpp | 2 |
4 files changed, 15 insertions, 5 deletions
diff --git a/indra/newview/llchatitemscontainerctrl.cpp b/indra/newview/llchatitemscontainerctrl.cpp index 997aed4277..8a6935b71b 100644 --- a/indra/newview/llchatitemscontainerctrl.cpp +++ b/indra/newview/llchatitemscontainerctrl.cpp @@ -187,8 +187,18 @@ void LLNearbyChatToastPanel::init(LLSD& notification) msg_text->setText(mFromName, style_params); } mText = mText.substr(3); - style_params.font.style = "UNDERLINE"; + style_params.font.style = "ITALIC"; +#define INFINITE_REFLOW_BUG 0 +#if INFINITE_REFLOW_BUG + // This causes LLTextBase::reflow() to infinite loop until the viewer + // runs out of memory, throws a bad_alloc exception from std::vector + // in mLineInfoList, and the main loop catches it and continues. + // It appears to be caused by addText() adding a line separator in the + // middle of a line. See EXT-2579, EXT-1949 msg_text->addText(mText,style_params); +#else + msg_text->appendText(mText, FALSE, style_params); +#endif } else { diff --git a/indra/newview/llimfloater.cpp b/indra/newview/llimfloater.cpp index bfac35d866..1f80543791 100644 --- a/indra/newview/llimfloater.cpp +++ b/indra/newview/llimfloater.cpp @@ -495,12 +495,12 @@ void LLIMFloater::updateMessages() if (from.size() > 0) { append_style_params.font.style = "ITALIC"; - chat.mText = from + " "; + chat.mText = from; mChatHistory->appendWidgetMessage(chat, append_style_params); } message = message.substr(3); - append_style_params.font.style = "UNDERLINE"; + append_style_params.font.style = "ITALIC"; mChatHistory->appendText(message, FALSE, append_style_params); } else diff --git a/indra/newview/llnearbychat.cpp b/indra/newview/llnearbychat.cpp index 16a47890c3..1f984e3af8 100644 --- a/indra/newview/llnearbychat.cpp +++ b/indra/newview/llnearbychat.cpp @@ -177,7 +177,7 @@ void LLNearbyChat::addMessage(const LLChat& chat) } message = message.substr(3); - append_style_params.font.style = "UNDERLINE"; + append_style_params.font.style = "ITALIC"; mChatHistory->appendText(message, FALSE, append_style_params); } else diff --git a/indra/newview/lltoastimpanel.cpp b/indra/newview/lltoastimpanel.cpp index d2cc6d0726..9040bdb41a 100644 --- a/indra/newview/lltoastimpanel.cpp +++ b/indra/newview/lltoastimpanel.cpp @@ -64,7 +64,7 @@ LLToastIMPanel::LLToastIMPanel(LLToastIMPanel::Params &p) : LLToastPanel(p.notif style_params.font.style ="ITALIC"; mMessage->appendText(p.from + " ", FALSE, style_params); - style_params.font.style = "UNDERLINE"; + style_params.font.style = "ITALIC"; mMessage->appendText(p.message.substr(3), FALSE, style_params); } else |