diff options
| author | Mnikolenko ProductEngine <mnikolenko@productengine.com> | 2015-09-30 13:31:08 +0300 |
|---|---|---|
| committer | Mnikolenko ProductEngine <mnikolenko@productengine.com> | 2015-09-30 13:31:08 +0300 |
| commit | 16f0cfe6dc0f95e599ff8365a876ea6ba62678f8 (patch) | |
| tree | f2f8b36904b9d479ed1c4688b9414abf6e0b13c5 /indra/newview/llexpandabletextbox.cpp | |
| parent | 45af9de2d13fae2296e426cd5a80f96c6c07af54 (diff) | |
MAINT-5670 FIXED <icon> should not be parsed in expandable textboxes
Diffstat (limited to 'indra/newview/llexpandabletextbox.cpp')
| -rwxr-xr-x | indra/newview/llexpandabletextbox.cpp | 6 |
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) |