From a46794bcff15b70ab4e5e04ce12d118579b72245 Mon Sep 17 00:00:00 2001
From: James Cook <james@lindenlab.com>
Date: Wed, 18 Nov 2009 14:27:58 -0800
Subject: [PATCH] EXT-2579 Fix memory leak/bloat due to /me IRC-style emotes.
Pending review with Richard/Leyla
---
indra/newview/llchatitemscontainerctrl.cpp | 10 ++++++++++
1 file changed, 10 insertions(+)
diff --git a/indra/newview/llchatitemscontainerctrl.cpp b/indra/newview/llchatitemscontainerctrl.cpp
index 997aed4277c..56b7520bd5e 100644
--- a/indra/newview/llchatitemscontainerctrl.cpp
+++ b/indra/newview/llchatitemscontainerctrl.cpp
@@ -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
{
--
GitLab