diff options
| author | James Cook <james@lindenlab.com> | 2009-11-28 21:02:55 -0800 |
|---|---|---|
| committer | James Cook <james@lindenlab.com> | 2009-11-28 21:02:55 -0800 |
| commit | e8b436591ad198a5aa37d51077e2d5b0d5b62562 (patch) | |
| tree | 196a32ac8cc9b67809201e0d762eee4b47a8cb9e /indra/llui/lltextbase.h | |
| parent | 0e34bc413aa562acf97b77333fb9a1f0ec9b55f0 (diff) | |
| parent | 9d52d15db8b61ff3172fadb1b82cd39f892251c5 (diff) | |
merge
Diffstat (limited to 'indra/llui/lltextbase.h')
| -rw-r--r-- | 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 c376a73615..c60b040655 100644 --- a/indra/llui/lltextbase.h +++ b/indra/llui/lltextbase.h @@ -84,11 +84,13 @@ public: wrap, use_ellipses, allow_html, - parse_highlights; + parse_highlights, + clip_partial; Optional<S32> v_pad, h_pad; + Optional<LineSpacingParams> line_spacing; @@ -347,6 +349,7 @@ protected: bool mTrackEnd; // if true, keeps scroll position at end of document during resize bool mReadOnly; bool mBGVisible; // render background? + bool mClipPartial; // false if we show lines that are partially inside bounding rect S32 mMaxTextByteLength; // Maximum length mText is allowed to be in bytes // support widgets |