diff options
Diffstat (limited to '')
-rw-r--r-- | linden/indra/llui/lltextbox.h | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/linden/indra/llui/lltextbox.h b/linden/indra/llui/lltextbox.h index bdcccf7..c8bdfc5 100644 --- a/linden/indra/llui/lltextbox.h +++ b/linden/indra/llui/lltextbox.h | |||
@@ -12,12 +12,12 @@ | |||
12 | * ("GPL"), unless you have obtained a separate licensing agreement | 12 | * ("GPL"), unless you have obtained a separate licensing agreement |
13 | * ("Other License"), formally executed by you and Linden Lab. Terms of | 13 | * ("Other License"), formally executed by you and Linden Lab. Terms of |
14 | * the GPL can be found in doc/GPL-license.txt in this distribution, or | 14 | * the GPL can be found in doc/GPL-license.txt in this distribution, or |
15 | * online at http://secondlife.com/developers/opensource/gplv2 | 15 | * online at http://secondlifegrid.net/programs/open_source/licensing/gplv2 |
16 | * | 16 | * |
17 | * There are special exceptions to the terms and conditions of the GPL as | 17 | * There are special exceptions to the terms and conditions of the GPL as |
18 | * it is applied to this Source Code. View the full text of the exception | 18 | * it is applied to this Source Code. View the full text of the exception |
19 | * in the file doc/FLOSS-exception.txt in this software distribution, or | 19 | * in the file doc/FLOSS-exception.txt in this software distribution, or |
20 | * online at http://secondlife.com/developers/opensource/flossexception | 20 | * online at http://secondlifegrid.net/programs/open_source/licensing/flossexception |
21 | * | 21 | * |
22 | * By copying, modifying or distributing this software, you acknowledge | 22 | * By copying, modifying or distributing this software, you acknowledge |
23 | * that you have read and understood your obligations described above, | 23 | * that you have read and understood your obligations described above, |
@@ -79,6 +79,7 @@ public: | |||
79 | void setText( const LLStringExplicit& text ); | 79 | void setText( const LLStringExplicit& text ); |
80 | void setWrappedText(const LLStringExplicit& text, F32 max_width = -1.0); | 80 | void setWrappedText(const LLStringExplicit& text, F32 max_width = -1.0); |
81 | // default width means use existing control width | 81 | // default width means use existing control width |
82 | void setUseEllipses( BOOL use_ellipses ) { mUseEllipses = use_ellipses; } | ||
82 | 83 | ||
83 | void setBackgroundVisible(BOOL visible) { mBackgroundVisible = visible; } | 84 | void setBackgroundVisible(BOOL visible) { mBackgroundVisible = visible; } |
84 | void setBorderVisible(BOOL visible) { mBorderVisible = visible; } | 85 | void setBorderVisible(BOOL visible) { mBorderVisible = visible; } |
@@ -124,6 +125,7 @@ protected: | |||
124 | 125 | ||
125 | U8 mFontStyle; // style bit flags for font | 126 | U8 mFontStyle; // style bit flags for font |
126 | BOOL mBorderDropShadowVisible; | 127 | BOOL mBorderDropShadowVisible; |
128 | BOOL mUseEllipses; | ||
127 | 129 | ||
128 | S32 mHPad; | 130 | S32 mHPad; |
129 | S32 mVPad; | 131 | S32 mVPad; |