diff options
| author | Steven Bennetts <steve@lindenlab.com> | 2008-06-26 00:39:00 +0000 |
|---|---|---|
| committer | Steven Bennetts <steve@lindenlab.com> | 2008-06-26 00:39:00 +0000 |
| commit | 25c10ed028da5c547b11f1f461916897272b0e6d (patch) | |
| tree | 350a5858f8970b6e28b2dc395625d74d8bd597b2 /indra/llui/llstyle.cpp | |
| parent | 6dd125d375b38455997a0c4b8747659f4c2351aa (diff) | |
QAR-628 merge string-cleanup-5 -r 90476:90508 -> release
dataserver-is-deprecated
Diffstat (limited to 'indra/llui/llstyle.cpp')
| -rw-r--r-- | indra/llui/llstyle.cpp | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/indra/llui/llstyle.cpp b/indra/llui/llstyle.cpp index 38608745c1..0bdc208a9e 100644 --- a/indra/llui/llstyle.cpp +++ b/indra/llui/llstyle.cpp @@ -39,7 +39,7 @@ LLStyle::LLStyle() { - init(TRUE, LLColor4(0,0,0,1),""); + init(TRUE, LLColor4(0,0,0,1),LLStringUtil::null); } LLStyle::LLStyle(const LLStyle &style) @@ -62,21 +62,21 @@ LLStyle::LLStyle(const LLStyle &style) } else { - init(TRUE, LLColor4(0,0,0,1),""); + init(TRUE, LLColor4(0,0,0,1),LLStringUtil::null); } } -LLStyle::LLStyle(BOOL is_visible, const LLColor4 &color, const LLString& font_name) +LLStyle::LLStyle(BOOL is_visible, const LLColor4 &color, const std::string& font_name) { init(is_visible, color, font_name); } -void LLStyle::init(BOOL is_visible, const LLColor4 &color, const LLString& font_name) +void LLStyle::init(BOOL is_visible, const LLColor4 &color, const std::string& font_name) { mVisible = is_visible; mColor = color; setFontName(font_name); - setLinkHREF(""); + setLinkHREF(LLStringUtil::null); mItalic = FALSE; mBold = FALSE; mUnderline = FALSE; @@ -110,12 +110,12 @@ LLStyle &LLStyle::operator=(const LLStyle &rhs) } -void LLStyle::setFontName(const LLString& fontname) +void LLStyle::setFontName(const std::string& fontname) { mFontName = fontname; - LLString fontname_lc = fontname; - LLString::toLower(fontname_lc); + std::string fontname_lc = fontname; + LLStringUtil::toLower(fontname_lc); mFontID = LLFONT_OCRA; // default @@ -138,7 +138,7 @@ void LLStyle::setFontName(const LLString& fontname) } -void LLStyle::setLinkHREF(const LLString& href) +void LLStyle::setLinkHREF(const std::string& href) { mLink = href; } |