From 16f0cfe6dc0f95e599ff8365a876ea6ba62678f8 Mon Sep 17 00:00:00 2001
From: Mnikolenko ProductEngine <mnikolenko@productengine.com>
Date: Wed, 30 Sep 2015 13:31:08 +0300
Subject: MAINT-5670 FIXED <icon> should not be parsed in expandable textboxes

---
 indra/newview/llpanelpick.cpp | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'indra/newview/llpanelpick.cpp')

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;
 }
 
-- 
cgit v1.2.3