diff options
| author | Christian Goetze <cg@lindenlab.com> | 2007-10-10 00:01:43 +0000 |
|---|---|---|
| committer | Christian Goetze <cg@lindenlab.com> | 2007-10-10 00:01:43 +0000 |
| commit | 5ec8bbbe2244ea70d8aa74b5c572351632699425 (patch) | |
| tree | 12a4e92720c531105a21ef4f9f363b8572d72a3a /indra/llui/lltextbox.h | |
| parent | b3b62c3b9ef32c4dbcae51cd3ef582734d5717bb (diff) | |
svn merge -r71238:71367 svn+ssh://svn/svn/linden/branches/maint-ui-qa3
Diffstat (limited to 'indra/llui/lltextbox.h')
| -rw-r--r-- | indra/llui/lltextbox.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/indra/llui/lltextbox.h b/indra/llui/lltextbox.h index 24ad4d7aae..7e7018ac52 100644 --- a/indra/llui/lltextbox.h +++ b/indra/llui/lltextbox.h @@ -71,8 +71,8 @@ public: void setDisabledColor( const LLColor4& c) { mDisabledColor = c; } void setBackgroundColor( const LLColor4& c) { mBackgroundColor = c; } void setBorderColor( const LLColor4& c) { mBorderColor = c; } - void setText( const LLString& text ); - void setWrappedText(const LLString& text, F32 max_width = -1.0); + void setText( const LLStringExplicit& text ); + void setWrappedText(const LLStringExplicit& text, F32 max_width = -1.0); // default width means use existing control width void setBackgroundVisible(BOOL visible) { mBackgroundVisible = visible; } @@ -97,7 +97,7 @@ public: virtual void setValue(const LLSD& value ); virtual LLSD getValue() const; - virtual BOOL setTextArg( const LLString& key, const LLString& text ); + virtual BOOL setTextArg( const LLString& key, const LLStringExplicit& text ); protected: void setLineLengths(); |