Improved how opacity is displayed in color swatches.

Signed-off-by: Jacek Antonelli <jacek.antonelli@gmail.com>

2 files changed, 6 insertions, 2 deletions

diff --git a/ChangeLog.txt b/ChangeLog.txt
index 331c1b3..8d50ace 100644
--- a/ChangeLog.txt
+++ b/ChangeLog.txt
@@ -483,6 +483,11 @@
         * Merged working branch of 1.2 into LL 1.23 merge.
 
 
+2009-10-17 Kakurady <kakurady@gmail.com>
+
+        * Improved how opacity is displayed in color swatches.
+
+
 2009-08-29  Jacek Antonelli  <jacek.antonelli@gmail.com>
 
         * Updated Imprudence to be based on SL 1.23.4.
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();
                 }