diff options
| author | Callum Prentice <callum@lindenlab.com> | 2014-03-17 14:19:42 -0700 |
|---|---|---|
| committer | Callum Prentice <callum@lindenlab.com> | 2014-03-17 14:19:42 -0700 |
| commit | f232096bba9280dd78ef378612eeb65ae2814307 (patch) | |
| tree | 17da0d7b1bd17771691c461919bbba5f1780e905 /indra/llui/lltextbase.h | |
| parent | 4c225e3fc7b92e68a25efdb1ca8927e266e84ae5 (diff) | |
| parent | cb91708332b8b8ddfe27808602ec5f43f11c24c2 (diff) | |
Merge with viewer-release
Diffstat (limited to 'indra/llui/lltextbase.h')
| -rwxr-xr-x | indra/llui/lltextbase.h | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/indra/llui/lltextbase.h b/indra/llui/lltextbase.h index a74e97cac8..3603f55c3f 100755 --- a/indra/llui/lltextbase.h +++ b/indra/llui/lltextbase.h @@ -291,7 +291,8 @@ public: parse_urls, parse_highlights, clip, - clip_partial; + clip_partial, + trusted_content; Optional<S32> v_pad, h_pad; @@ -361,6 +362,7 @@ public: bool getWordWrap() { return mWordWrap; } bool getUseEllipses() { return mUseEllipses; } bool truncate(); // returns true of truncation occurred + bool isContentTrusted() {return mTrustedContent;} // TODO: move into LLTextSegment? void createUrlContextMenu(S32 x, S32 y, const std::string &url); // create a popup context menu for the given Url @@ -634,6 +636,7 @@ protected: bool mBGVisible; // render background? bool mClip; // clip text to widget rect bool mClipPartial; // false if we show lines that are partially inside bounding rect + bool mTrustedContent; // if false, does not allow to execute SURL links from this editor bool mPlainText; // didn't use Image or Icon segments bool mAutoIndent; S32 mMaxTextByteLength; // Maximum length mText is allowed to be in bytes |