diff options
Diffstat (limited to 'linden/indra/llui/llstyle.h')
-rw-r--r-- | linden/indra/llui/llstyle.h | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/linden/indra/llui/llstyle.h b/linden/indra/llui/llstyle.h index 6f0099c..56f1398 100644 --- a/linden/indra/llui/llstyle.h +++ b/linden/indra/llui/llstyle.h | |||
@@ -37,7 +37,7 @@ | |||
37 | #include "llfont.h" | 37 | #include "llfont.h" |
38 | #include "llui.h" | 38 | #include "llui.h" |
39 | 39 | ||
40 | class LLStyle | 40 | class LLStyle : public LLRefCount |
41 | { | 41 | { |
42 | public: | 42 | public: |
43 | LLStyle(); | 43 | LLStyle(); |
@@ -46,8 +46,6 @@ public: | |||
46 | 46 | ||
47 | LLStyle &operator=(const LLStyle &rhs); | 47 | LLStyle &operator=(const LLStyle &rhs); |
48 | 48 | ||
49 | virtual ~LLStyle() { } | ||
50 | |||
51 | virtual void init (BOOL is_visible, const LLColor4 &color, const LLString& font_name); | 49 | virtual void init (BOOL is_visible, const LLColor4 &color, const LLString& font_name); |
52 | 50 | ||
53 | virtual const LLColor4& getColor() const { return mColor; } | 51 | virtual const LLColor4& getColor() const { return mColor; } |
@@ -101,6 +99,9 @@ public: | |||
101 | S32 mImageWidth; | 99 | S32 mImageWidth; |
102 | S32 mImageHeight; | 100 | S32 mImageHeight; |
103 | 101 | ||
102 | protected: | ||
103 | virtual ~LLStyle() { } | ||
104 | |||
104 | private: | 105 | private: |
105 | BOOL mVisible; | 106 | BOOL mVisible; |
106 | LLColor4 mColor; | 107 | LLColor4 mColor; |
@@ -111,4 +112,6 @@ private: | |||
111 | BOOL mIsEmbeddedItem; | 112 | BOOL mIsEmbeddedItem; |
112 | }; | 113 | }; |
113 | 114 | ||
115 | typedef LLPointer<LLStyle> LLStyleSP; | ||
116 | |||
114 | #endif // LL_LLSTYLE_H | 117 | #endif // LL_LLSTYLE_H |