Automated merge with ssh://bitbucket.org/nat_linden/viewer-no-leap-test

1 files changed, 6 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)