diff options
| author | simon <none@none> | 2014-01-10 13:15:19 -0800 |
|---|---|---|
| committer | simon <none@none> | 2014-01-10 13:15:19 -0800 |
| commit | cfadbe631fbf845db8e26793613dea37ef08d11c (patch) | |
| tree | 1283cd746e6a1b0d0ffc214e8cc6863f1202c226 /indra/llui/lltextbase.h | |
| parent | f291995dac53c2aba9d79aef8b6cd91a5c836e9f (diff) | |
Revert earlier back-out for MAINT-535 ... it's back in
Diffstat (limited to 'indra/llui/lltextbase.h')
| -rwxr-xr-x | indra/llui/lltextbase.h | 14 |
1 files changed, 5 insertions, 9 deletions
diff --git a/indra/llui/lltextbase.h b/indra/llui/lltextbase.h index 515e4d4257..3603f55c3f 100755 --- a/indra/llui/lltextbase.h +++ b/indra/llui/lltextbase.h @@ -291,11 +291,9 @@ public: parse_urls, parse_highlights, clip, - clip_partial; - // MAINT-535 reversion test - // clip_partial, - // trusted_content; - + clip_partial, + trusted_content; + Optional<S32> v_pad, h_pad; @@ -364,8 +362,7 @@ public: bool getWordWrap() { return mWordWrap; } bool getUseEllipses() { return mUseEllipses; } bool truncate(); // returns true of truncation occurred - // MAINT-535 reversion test - //bool isContentTrusted() {return mTrustedContent;} + 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 @@ -639,8 +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 - // MAINT-535 reversion test - //bool mTrustedContent; // if false, does not allow to execute SURL links from this editor + 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 |