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.h | |
| parent | 6dd125d375b38455997a0c4b8747659f4c2351aa (diff) | |
QAR-628 merge string-cleanup-5 -r 90476:90508 -> release
dataserver-is-deprecated
Diffstat (limited to 'indra/llui/llstyle.h')
| -rw-r--r-- | indra/llui/llstyle.h | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/indra/llui/llstyle.h b/indra/llui/llstyle.h index 6896ee288f..ecb2d3c541 100644 --- a/indra/llui/llstyle.h +++ b/indra/llui/llstyle.h @@ -42,11 +42,11 @@ class LLStyle : public LLRefCount public: LLStyle(); LLStyle(const LLStyle &style); - LLStyle(BOOL is_visible, const LLColor4 &color, const LLString& font_name); + LLStyle(BOOL is_visible, const LLColor4 &color, const std::string& font_name); LLStyle &operator=(const LLStyle &rhs); - virtual void init (BOOL is_visible, const LLColor4 &color, const LLString& font_name); + virtual void init (BOOL is_visible, const LLColor4 &color, const std::string& font_name); virtual const LLColor4& getColor() const { return mColor; } virtual void setColor(const LLColor4 &color) { mColor = color; } @@ -54,12 +54,12 @@ public: virtual BOOL isVisible() const; virtual void setVisible(BOOL is_visible); - virtual const LLString& getFontString() const { return mFontName; } - virtual void setFontName(const LLString& fontname); + virtual const std::string& getFontString() const { return mFontName; } + virtual void setFontName(const std::string& fontname); virtual LLFONT_ID getFontID() const { return mFontID; } - virtual const LLString& getLinkHREF() const { return mLink; } - virtual void setLinkHREF(const LLString& href); + virtual const std::string& getLinkHREF() const { return mLink; } + virtual void setLinkHREF(const std::string& href); virtual BOOL isLink() const; virtual LLUIImagePtr getImage() const; @@ -105,9 +105,9 @@ protected: private: BOOL mVisible; LLColor4 mColor; - LLString mFontName; + std::string mFontName; LLFONT_ID mFontID; - LLString mLink; + std::string mLink; LLUIImagePtr mImagep; BOOL mIsEmbeddedItem; }; |