diff options
| author | Bryan O'Sullivan <bos@lindenlab.com> | 2009-09-08 14:28:31 -0700 |
|---|---|---|
| committer | Bryan O'Sullivan <bos@lindenlab.com> | 2009-09-08 14:28:31 -0700 |
| commit | 76001ce3f0b53391c674f315855017b78a3a2873 (patch) | |
| tree | a2c74f15dcf8c611ce87c4cb6c3a5751e9b8d9e3 /indra/llui/llstyle.h | |
| parent | 40743eaf99c9cbfee08f0bb44bc7c614bc660f34 (diff) | |
| parent | 2ed83382a1dd84575536c16e248a602ba96755cd (diff) | |
Merge
Diffstat (limited to 'indra/llui/llstyle.h')
| -rw-r--r-- | indra/llui/llstyle.h | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/indra/llui/llstyle.h b/indra/llui/llstyle.h index dcf274a651..5e8883afd7 100644 --- a/indra/llui/llstyle.h +++ b/indra/llui/llstyle.h @@ -69,9 +69,9 @@ public: LLUIImagePtr getImage() const; void setImage(const LLUUID& src); + void setImage(const std::string& name); - BOOL isImage() const { return ((mImageWidth != 0) && (mImageHeight != 0)); } - void setImageSize(S32 width, S32 height); + BOOL isImage() const { return mImagep.notNull(); } // inlined here to make it easier to compare to member data below. -MG bool operator==(const LLStyle &rhs) const @@ -82,8 +82,6 @@ public: && mFont == rhs.mFont && mLink == rhs.mLink && mImagep == rhs.mImagep - && mImageHeight == rhs.mImageHeight - && mImageWidth == rhs.mImageWidth && mItalic == rhs.mItalic && mBold == rhs.mBold && mUnderline == rhs.mUnderline @@ -97,8 +95,6 @@ public: BOOL mBold; BOOL mUnderline; BOOL mDropShadow; - S32 mImageWidth; - S32 mImageHeight; protected: ~LLStyle() { } |