MAINT-5670 FIXED <icon> should not be parsed in expandable textboxes

5 files changed, 13 insertions, 0 deletions

diff --git a/indra/newview/llexpandabletextbox.cpp b/indra/newview/llexpandabletextbox.cpp
index f2602c8c7d..61b5748201 100755
--- a/indra/newview/llexpandabletextbox.cpp
+++ b/indra/newview/llexpandabletextbox.cpp
@@ -237,6 +237,7 @@ LLExpandableTextBox::LLExpandableTextBox(const Params& p)
 	LLTextBoxEx::Params textbox_params = p.textbox;
 	textbox_params.rect(rc);
 	mTextBox = LLUICtrlFactory::create<LLTextBoxEx>(textbox_params);
+	mTextBox->setContentTrusted(false);
 	mScroll->addChild(mTextBox);
 
 	updateTextBoxRect();
@@ -260,6 +261,11 @@ void LLExpandableTextBox::draw()
 	LLUICtrl::draw();
 }
 
+void LLExpandableTextBox::setContentTrusted(bool trusted_content)
+{
+    mTextBox->setContentTrusted(trusted_content);
+}
+
 void LLExpandableTextBox::collapseIfPosChanged()
 {
 	if(mExpanded)
diff --git a/indra/newview/llexpandabletextbox.h b/indra/newview/llexpandabletextbox.h
index 5dea35bb82..90d46ab262 100755
--- a/indra/newview/llexpandabletextbox.h
+++ b/indra/newview/llexpandabletextbox.h
@@ -194,6 +194,8 @@ protected:
 	 */
 	virtual S32 recalculateTextDelta(S32 text_delta);
 
+	void setContentTrusted(bool trusted_content);
+
 protected:
 
 	std::string mText;
diff --git a/indra/newview/llpanelpick.cpp b/indra/newview/llpanelpick.cpp
index 8fa9aac024..40326cfb39 100755
--- a/indra/newview/llpanelpick.cpp
+++ b/indra/newview/llpanelpick.cpp
@@ -148,6 +148,9 @@ BOOL LLPanelPickInfo::postBuild()
 	mScrollingPanelMinHeight = mScrollContainer->getScrolledViewRect().getHeight();
 	mScrollingPanelWidth = mScrollingPanel->getRect().getWidth();
 
+	LLTextEditor* text_desc = getChild<LLTextEditor>(XML_DESC);
+	text_desc->setContentTrusted(false);
+
 	return TRUE;
 }
 
diff --git a/indra/newview/llsyswellitem.cpp b/indra/newview/llsyswellitem.cpp
index 057d80457c..2a58f018e7 100755
--- a/indra/newview/llsyswellitem.cpp
+++ b/indra/newview/llsyswellitem.cpp
@@ -43,6 +43,7 @@ LLSysWellItem::LLSysWellItem(const Params& p) : LLPanel(p),
 	mTitle = getChild<LLTextBox>("title");
 	mCloseBtn = getChild<LLButton>("close_btn");
 
+	mTitle->setContentTrusted(false);
 	mTitle->setValue(p.title);
 	mCloseBtn->setClickedCallback(boost::bind(&LLSysWellItem::onClickCloseBtn,this));
 
diff --git a/indra/newview/lltoastgroupnotifypanel.cpp b/indra/newview/lltoastgroupnotifypanel.cpp
index e00b18dedb..d21e101857 100755
--- a/indra/newview/lltoastgroupnotifypanel.cpp
+++ b/indra/newview/lltoastgroupnotifypanel.cpp
@@ -98,6 +98,7 @@ LLToastGroupNotifyPanel::LLToastGroupNotifyPanel(const LLNotificationPtr& notifi
 	LLStringUtil::format(timeStr, substitution);
 
 	LLViewerTextEditor* pMessageText = getChild<LLViewerTextEditor>("message");
+	pMessageText->setContentTrusted(false);
 	pMessageText->clear();
 
 	LLStyle::Params style;