summaryrefslogtreecommitdiff
path: root/indra/newview/llpanelpick.cpp
diff options
context:
space:
mode:
authorMnikolenko ProductEngine <mnikolenko@productengine.com>2015-09-30 13:31:08 +0300
committerMnikolenko ProductEngine <mnikolenko@productengine.com>2015-09-30 13:31:08 +0300
commit16f0cfe6dc0f95e599ff8365a876ea6ba62678f8 (patch)
treef2f8b36904b9d479ed1c4688b9414abf6e0b13c5 /indra/newview/llpanelpick.cpp
parent45af9de2d13fae2296e426cd5a80f96c6c07af54 (diff)
MAINT-5670 FIXED <icon> should not be parsed in expandable textboxes
Diffstat (limited to 'indra/newview/llpanelpick.cpp')
-rwxr-xr-xindra/newview/llpanelpick.cpp3
1 files changed, 3 insertions, 0 deletions
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;
}