From 27936532ebe6c71f78ecc35a50b75a92dddeb2c0 Mon Sep 17 00:00:00 2001
From: Kakurady
Date: Sat, 17 Oct 2009 14:18:58 -0400
Subject: Improved how opacity is displayed in color swatches.

Signed-off-by: Jacek Antonelli <jacek.antonelli@gmail.com>
---
 linden/indra/newview/llcolorswatch.cpp | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

(limited to 'linden/indra')

diff --git a/linden/indra/newview/llcolorswatch.cpp b/linden/indra/newview/llcolorswatch.cpp
index 3222c0d..5905bb0 100644
--- a/linden/indra/newview/llcolorswatch.cpp
+++ b/linden/indra/newview/llcolorswatch.cpp
@@ -219,12 +219,11 @@ void LLColorSwatchCtrl::draw()
 		gl_rect_2d(interior, mColor, TRUE);
 		LLColor4 opaque_color = mColor;
 		opaque_color.mV[VALPHA] = 1.f;
-		gGL.color4fv(opaque_color.mV);
 		if (mAlphaGradientImage.notNull())
 		{
 			gGL.pushMatrix();
 			{
-				mAlphaGradientImage->draw(interior, mColor);
+				mAlphaGradientImage->draw(interior, opaque_color);
 			}
 			gGL.popMatrix();
 		}
-- 
cgit v1.1