diff options
| author | simon <none@none> | 2014-01-07 15:18:29 -0800 |
|---|---|---|
| committer | simon <none@none> | 2014-01-07 15:18:29 -0800 |
| commit | f291995dac53c2aba9d79aef8b6cd91a5c836e9f (patch) | |
| tree | 8dd6b3b8dcde04580163c2f96ff03ac2ec80ce44 /indra/llui/lltextbase.h | |
| parent | 2a1098552e071c625a8c1614a331e9557212d380 (diff) | |
Revert changes made for MAINT-535 to test in a release cohort.
Diffstat (limited to 'indra/llui/lltextbase.h')
| -rwxr-xr-x | indra/llui/lltextbase.h | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/indra/llui/lltextbase.h b/indra/llui/lltextbase.h index 3603f55c3f..515e4d4257 100755 --- a/indra/llui/lltextbase.h +++ b/indra/llui/lltextbase.h @@ -291,9 +291,11 @@ public: parse_urls, parse_highlights, clip, - clip_partial, - trusted_content; - + clip_partial; + // MAINT-535 reversion test + // clip_partial, + // trusted_content; + Optional<S32> v_pad, h_pad; @@ -362,7 +364,8 @@ public: bool getWordWrap() { return mWordWrap; } bool getUseEllipses() { return mUseEllipses; } bool truncate(); // returns true of truncation occurred - bool isContentTrusted() {return mTrustedContent;} + // MAINT-535 reversion test + //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 @@ -636,7 +639,8 @@ 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 + // MAINT-535 reversion test + //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 |