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

merge

meow-7.2.2
James Cook 2009-11-18 14:33:09 -08:00
parent de23a4d92c 203490e2a0
commit 5649faf6d9
4 changed files with 15 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
indra/newview/llchatitemscontainerctrl.cpp
View File

@ -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
{

4
indra/newview/llimfloater.cpp
View File

@ -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

2
indra/newview/llnearbychat.cpp
View File

@ -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

2
indra/newview/lltoastimpanel.cpp
View File

@ -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