Skip to content
Snippets Groups Projects
Commit a46794bc authored by James Cook's avatar James Cook
Browse files

EXT-2579 Fix memory leak/bloat due to /me IRC-style emotes.

Pending review with Richard/Leyla
parent 1875d5e3
No related branches found
No related tags found
No related merge requests found
......@@ -188,7 +188,17 @@ void LLNearbyChatToastPanel::init(LLSD& notification)
}
mText = mText.substr(3);
style_params.font.style = "UNDERLINE";
#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
{
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment