diff options
| author | Steven Bennetts <steve@lindenlab.com> | 2009-06-21 08:04:56 +0000 |
|---|---|---|
| committer | Steven Bennetts <steve@lindenlab.com> | 2009-06-21 08:04:56 +0000 |
| commit | 9ec432034dc3c45d7ce763eb02dae4cc7f6b8da8 (patch) | |
| tree | 4a505c1e0919af52800b3ffb3eaf135e7d6f9ce6 /indra/llui/llstyle.h | |
| parent | 351ebe9fcb76f3b99c2957004bb8493a904869ee (diff) | |
merge -r 122421-124917 viewer-2.0.0-2 -> viewer-2.0.0-3
ignore-dead-branch
Diffstat (limited to 'indra/llui/llstyle.h')
| -rw-r--r-- | indra/llui/llstyle.h | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/indra/llui/llstyle.h b/indra/llui/llstyle.h index 3ad379cdd9..890abc7d67 100644 --- a/indra/llui/llstyle.h +++ b/indra/llui/llstyle.h @@ -34,10 +34,11 @@ #define LL_LLSTYLE_H #include "v4color.h" -#include "llresmgr.h" #include "llfont.h" #include "llui.h" +class LLFontGL; + class LLStyle : public LLRefCount { public: @@ -55,9 +56,9 @@ public: virtual BOOL isVisible() const; virtual void setVisible(BOOL is_visible); - virtual const std::string& getFontString() const { return mFontName; } + virtual const std::string& getFontString() const; virtual void setFontName(const std::string& fontname); - virtual LLFONT_ID getFontID() const { return mFontID; } + virtual LLFontGL* getFont() const; virtual const std::string& getLinkHREF() const { return mLink; } virtual void setLinkHREF(const std::string& href); @@ -107,7 +108,7 @@ private: BOOL mVisible; LLColor4 mColor; std::string mFontName; - LLFONT_ID mFontID; + LLFontGL* mFont; // cached for performance std::string mLink; LLUIImagePtr mImagep; BOOL mIsEmbeddedItem; |