From 58bce2d205bee3f5adb33b15efe73098e77429eb Mon Sep 17 00:00:00 2001
From: Richard Nelson <richard@lindenlab.com>
Date: Wed, 9 Sep 2009 01:26:44 +0000
Subject: merge -r132032-132812
 svn+ssh://svn.lindenlab.com/svn/linden/branches/gooey/gooey-1

---
 indra/llui/lliconctrl.cpp | 10 +---------
 1 file changed, 1 insertion(+), 9 deletions(-)

(limited to 'indra/llui/lliconctrl.cpp')

diff --git a/indra/llui/lliconctrl.cpp b/indra/llui/lliconctrl.cpp
index 673c742e7a..0330a2b374 100644
--- a/indra/llui/lliconctrl.cpp
+++ b/indra/llui/lliconctrl.cpp
@@ -74,20 +74,12 @@ void LLIconCtrl::draw()
 {
 	if( mImagep.notNull() )
 	{
-		mImagep->draw(getLocalRect(), mColor.get() );
+		mImagep->draw(getLocalRect(), mColor.get() % getDrawContext().mAlpha );
 	}
 
 	LLUICtrl::draw();
 }
 
-// virtual 
-void LLIconCtrl::setAlpha(F32 alpha)
-{
-	LLColor4 temp = mColor.get();
-	temp.setAlpha(alpha);
-	mColor.set(temp);
-}
-
 // virtual
 // value might be a string or a UUID
 void LLIconCtrl::setValue(const LLSD& value )
-- 
cgit v1.2.3