From cd17687f01420952712a500107e0f93e7ab8d5f8 Mon Sep 17 00:00:00 2001
From: Jacek Antonelli
Date: Fri, 15 Aug 2008 23:45:34 -0500
Subject: Second Life viewer sources 1.19.1.0

---
 linden/indra/llui/llstyle.cpp | 94 +------------------------------------------
 1 file changed, 1 insertion(+), 93 deletions(-)

(limited to 'linden/indra/llui/llstyle.cpp')

diff --git a/linden/indra/llui/llstyle.cpp b/linden/indra/llui/llstyle.cpp
index 693e0be..cdf87d3 100644
--- a/linden/indra/llui/llstyle.cpp
+++ b/linden/indra/llui/llstyle.cpp
@@ -71,11 +71,6 @@ LLStyle::LLStyle(BOOL is_visible, const LLColor4 &color, const LLString& font_na
 	init(is_visible, color, font_name);
 }
 
-LLStyle::~LLStyle()
-{
-	free();
-}
-
 void LLStyle::init(BOOL is_visible, const LLColor4 &color, const LLString& font_name)
 {
 	mVisible = is_visible;
@@ -91,14 +86,6 @@ void LLStyle::init(BOOL is_visible, const LLColor4 &color, const LLString& font_
 	mIsEmbeddedItem = FALSE;
 }
 
-void LLStyle::free()
-{
-}
-
-LLFONT_ID LLStyle::getFontID() const
-{
-	return mFontID;	
-}
 
 // Copy assignment
 LLStyle &LLStyle::operator=(const LLStyle &rhs)
@@ -122,48 +109,6 @@ LLStyle &LLStyle::operator=(const LLStyle &rhs)
 	return *this;
 }
 
-// Compare
-bool LLStyle::operator==(const LLStyle &rhs) const
-{
-	if ((mVisible != rhs.isVisible()) 
-		|| (mColor != rhs.getColor()) 
-		|| (mFontName != rhs.getFontString())
-		|| (mLink != rhs.getLinkHREF())
-		|| (mImagep != rhs.mImagep)
-		|| (mImageHeight != rhs.mImageHeight)
-		|| (mImageWidth != rhs.mImageWidth)
-		|| (mItalic != rhs.mItalic)
-		|| (mBold != rhs.mBold)
-		|| (mUnderline != rhs.mUnderline)
-		|| (mDropShadow != rhs.mDropShadow)
-		|| (mIsEmbeddedItem != rhs.mIsEmbeddedItem)
-		)
-	{
-		return FALSE;
-	}
-	return TRUE;
-}
-
-bool LLStyle::operator!=(const LLStyle& rhs) const
-{
-	return !(*this == rhs);
-}
-
-
-const LLColor4& LLStyle::getColor() const
-{
-	return(mColor);
-}
-
-void LLStyle::setColor(const LLColor4 &color)
-{
-	mColor = color;
-}
-
-const LLString& LLStyle::getFontString() const
-{
-	return mFontName;
-}
 
 void LLStyle::setFontName(const LLString& fontname)
 {
@@ -192,52 +137,15 @@ void LLStyle::setFontName(const LLString& fontname)
 	}
 }
 
-const LLString& LLStyle::getLinkHREF() const
-{
-	return mLink;
-}
-
-void LLStyle::setLinkHREF(const LLString& href)
-{
-	mLink = href;
-}
-
-BOOL LLStyle::isLink() const
-{
-	return mLink.size();
-}
-
-BOOL LLStyle::isVisible() const
-{
-	return mVisible;
-}
-
-void LLStyle::setVisible(BOOL is_visible)
-{
-	mVisible = is_visible;
-}
-
-LLImageGL *LLStyle::getImage() const
-{
-	return mImagep;
-}
 
 void LLStyle::setImage(const LLString& src)
 {
-	if (src.size() < UUID_STR_LENGTH - 1)
-	{
-		return;
-	}
-	else
+	if (src.size() >= UUID_STR_LENGTH - 1)
 	{
 		mImagep = LLUI::sImageProvider->getImageByID(LLUUID(src));
 	}
 }
 
-BOOL LLStyle::isImage() const
-{
-	return ((mImageWidth != 0) && (mImageHeight != 0));
-}
 
 void LLStyle::setImageSize(S32 width, S32 height)
 {
-- 
cgit v1.1