diff options
Diffstat (limited to '')
-rw-r--r-- | linden/indra/llui/lltextbox.h | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/linden/indra/llui/lltextbox.h b/linden/indra/llui/lltextbox.h index e8d4690..7e7018a 100644 --- a/linden/indra/llui/lltextbox.h +++ b/linden/indra/llui/lltextbox.h | |||
@@ -2,6 +2,8 @@ | |||
2 | * @file lltextbox.h | 2 | * @file lltextbox.h |
3 | * @brief A single text item display | 3 | * @brief A single text item display |
4 | * | 4 | * |
5 | * $LicenseInfo:firstyear=2001&license=viewergpl$ | ||
6 | * | ||
5 | * Copyright (c) 2001-2007, Linden Research, Inc. | 7 | * Copyright (c) 2001-2007, Linden Research, Inc. |
6 | * | 8 | * |
7 | * Second Life Viewer Source Code | 9 | * Second Life Viewer Source Code |
@@ -24,6 +26,7 @@ | |||
24 | * ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO | 26 | * ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO |
25 | * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY, | 27 | * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY, |
26 | * COMPLETENESS OR PERFORMANCE. | 28 | * COMPLETENESS OR PERFORMANCE. |
29 | * $/LicenseInfo$ | ||
27 | */ | 30 | */ |
28 | 31 | ||
29 | #ifndef LL_LLTEXTBOX_H | 32 | #ifndef LL_LLTEXTBOX_H |
@@ -68,8 +71,8 @@ public: | |||
68 | void setDisabledColor( const LLColor4& c) { mDisabledColor = c; } | 71 | void setDisabledColor( const LLColor4& c) { mDisabledColor = c; } |
69 | void setBackgroundColor( const LLColor4& c) { mBackgroundColor = c; } | 72 | void setBackgroundColor( const LLColor4& c) { mBackgroundColor = c; } |
70 | void setBorderColor( const LLColor4& c) { mBorderColor = c; } | 73 | void setBorderColor( const LLColor4& c) { mBorderColor = c; } |
71 | void setText( const LLString& text ); | 74 | void setText( const LLStringExplicit& text ); |
72 | void setWrappedText(const LLString& text, F32 max_width = -1.0); | 75 | void setWrappedText(const LLStringExplicit& text, F32 max_width = -1.0); |
73 | // default width means use existing control width | 76 | // default width means use existing control width |
74 | 77 | ||
75 | void setBackgroundVisible(BOOL visible) { mBackgroundVisible = visible; } | 78 | void setBackgroundVisible(BOOL visible) { mBackgroundVisible = visible; } |
@@ -94,7 +97,7 @@ public: | |||
94 | 97 | ||
95 | virtual void setValue(const LLSD& value ); | 98 | virtual void setValue(const LLSD& value ); |
96 | virtual LLSD getValue() const; | 99 | virtual LLSD getValue() const; |
97 | virtual BOOL setTextArg( const LLString& key, const LLString& text ); | 100 | virtual BOOL setTextArg( const LLString& key, const LLStringExplicit& text ); |
98 | 101 | ||
99 | protected: | 102 | protected: |
100 | void setLineLengths(); | 103 | void setLineLengths(); |