diff options
| author | angela <angela@lindenlab.com> | 2009-11-19 11:43:47 +0800 |
|---|---|---|
| committer | angela <angela@lindenlab.com> | 2009-11-19 11:43:47 +0800 |
| commit | 6e5f529a7adb53fa021986aed6e6b1b229cc0efd (patch) | |
| tree | a031044cfb6618a5b36a0e80d0fc3a918dfa07a9 /indra/newview/llchatitemscontainerctrl.cpp | |
| parent | a35fbddb910fa0dd068622c3dc64af1b27ca19b7 (diff) | |
| parent | 81eca4a7823f7fa06327b8185b6603d1f3c9ac9a (diff) | |
branch merge
Diffstat (limited to 'indra/newview/llchatitemscontainerctrl.cpp')
| -rw-r--r-- | indra/newview/llchatitemscontainerctrl.cpp | 14 |
1 files changed, 11 insertions, 3 deletions
diff --git a/indra/newview/llchatitemscontainerctrl.cpp b/indra/newview/llchatitemscontainerctrl.cpp index b1dee46d2e..8a6935b71b 100644 --- a/indra/newview/llchatitemscontainerctrl.cpp +++ b/indra/newview/llchatitemscontainerctrl.cpp @@ -175,8 +175,6 @@ void LLNearbyChatToastPanel::init(LLSD& notification) caption->getChild<LLTextBox>("sender_name", false)->setText(str_sender , style_params); - caption->getChild<LLTextBox>("msg_time", false)->setText(appendTime() , style_params ); - LLChatMsgBox* msg_text = getChild<LLChatMsgBox>("msg_text", false); @@ -189,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 { |