diff options
| author | Richard Linden <none@none> | 2010-07-15 10:45:24 -0700 |
|---|---|---|
| committer | Richard Linden <none@none> | 2010-07-15 10:45:24 -0700 |
| commit | dd72f789e2c25a41a6d921bafb20d17e26bd2acc (patch) | |
| tree | ff11013ee4e91ecde7a3d1a4007a44fd1340f260 /indra/llui/lltextbase.cpp | |
| parent | dee93e85601bce555784f07eb83e97aef45ec9b5 (diff) | |
| parent | 2fb2efe2a24127ccb274cfdf1ca8e7e22d301ed5 (diff) | |
Automated merge with ssh://richard@hg.lindenlab.com/dessie/viewer-public
Diffstat (limited to 'indra/llui/lltextbase.cpp')
| -rw-r--r-- | indra/llui/lltextbase.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/indra/llui/lltextbase.cpp b/indra/llui/lltextbase.cpp index ed03645944..dd0b7ebad1 100644 --- a/indra/llui/lltextbase.cpp +++ b/indra/llui/lltextbase.cpp @@ -167,11 +167,12 @@ LLTextBase::Params::Params() font_shadow("font_shadow"), wrap("wrap"), use_ellipses("use_ellipses", false), - allow_html("allow_html", false), + parse_urls("parse_urls", false), parse_highlights("parse_highlights", false) { addSynonym(track_end, "track_bottom"); addSynonym(wrap, "word_wrap"); + addSynonym(parse_urls, "allow_html"); } @@ -209,7 +210,7 @@ LLTextBase::LLTextBase(const LLTextBase::Params &p) mPlainText ( p.plain_text ), mWordWrap(p.wrap), mUseEllipses( p.use_ellipses ), - mParseHTML(p.allow_html), + mParseHTML(p.parse_urls), mParseHighlights(p.parse_highlights), mBGVisible(p.bg_visible), mScroller(NULL), |