livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

meow-7.2.2
Mnikolenko ProductEngine 2015-09-30 13:31:08 +03:00
parent 45af9de2d1
commit 16f0cfe6dc
5 changed files with 13 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
indra/newview/llexpandabletextbox.cpp
View File

@ -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)

2
indra/newview/llexpandabletextbox.h
View File

@ -194,6 +194,8 @@ protected:
*/
virtual S32 recalculateTextDelta(S32 text_delta);
void setContentTrusted(bool trusted_content);
protected:
std::string mText;

3
indra/newview/llpanelpick.cpp
View File

@ -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;
}

1
indra/newview/llsyswellitem.cpp
View File

@ -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));

1
indra/newview/lltoastgroupnotifypanel.cpp
View File

@ -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;