aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden/indra/llui/llstyle.h
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--linden/indra/llui/llstyle.h17
1 files changed, 9 insertions, 8 deletions
diff --git a/linden/indra/llui/llstyle.h b/linden/indra/llui/llstyle.h
index d6ae900..6f0099c 100644
--- a/linden/indra/llui/llstyle.h
+++ b/linden/indra/llui/llstyle.h
@@ -35,7 +35,7 @@
35#include "v4color.h" 35#include "v4color.h"
36#include "llresmgr.h" 36#include "llresmgr.h"
37#include "llfont.h" 37#include "llfont.h"
38#include "llimagegl.h" 38#include "llui.h"
39 39
40class LLStyle 40class LLStyle
41{ 41{
@@ -53,19 +53,20 @@ public:
53 virtual const LLColor4& getColor() const { return mColor; } 53 virtual const LLColor4& getColor() const { return mColor; }
54 virtual void setColor(const LLColor4 &color) { mColor = color; } 54 virtual void setColor(const LLColor4 &color) { mColor = color; }
55 55
56 virtual BOOL isVisible() const { return mVisible; } 56 virtual BOOL isVisible() const;
57 virtual void setVisible(BOOL is_visible) { mVisible = is_visible; } 57 virtual void setVisible(BOOL is_visible);
58 58
59 virtual const LLString& getFontString() const { return mFontName; } 59 virtual const LLString& getFontString() const { return mFontName; }
60 virtual void setFontName(const LLString& fontname); 60 virtual void setFontName(const LLString& fontname);
61 virtual LLFONT_ID getFontID() const { return mFontID; } 61 virtual LLFONT_ID getFontID() const { return mFontID; }
62 62
63 virtual const LLString& getLinkHREF() const { return mLink; } 63 virtual const LLString& getLinkHREF() const { return mLink; }
64 virtual void setLinkHREF(const LLString& href) { mLink = href; } 64 virtual void setLinkHREF(const LLString& href);
65 virtual BOOL isLink() const { return mLink.size(); } 65 virtual BOOL isLink() const;
66
67 virtual LLUIImagePtr getImage() const;
68 virtual void setImage(const LLUUID& src);
66 69
67 virtual LLImageGL *getImage() const { return mImagep; }
68 virtual void setImage(const LLString& src);
69 virtual BOOL isImage() const { return ((mImageWidth != 0) && (mImageHeight != 0)); } 70 virtual BOOL isImage() const { return ((mImageWidth != 0) && (mImageHeight != 0)); }
70 virtual void setImageSize(S32 width, S32 height); 71 virtual void setImageSize(S32 width, S32 height);
71 72
@@ -106,7 +107,7 @@ private:
106 LLString mFontName; 107 LLString mFontName;
107 LLFONT_ID mFontID; 108 LLFONT_ID mFontID;
108 LLString mLink; 109 LLString mLink;
109 LLPointer<LLImageGL> mImagep; 110 LLUIImagePtr mImagep;
110 BOOL mIsEmbeddedItem; 111 BOOL mIsEmbeddedItem;
111}; 112};
112 113