aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden/indra/newview
diff options
context:
space:
mode:
authorKakurady2009-10-17 14:18:58 -0400
committerJacek Antonelli2010-01-26 14:41:05 -0600
commit27936532ebe6c71f78ecc35a50b75a92dddeb2c0 (patch)
treef0fcd1f45cfac8d9345cd20e55b538634bcea016 /linden/indra/newview
parentChangeLog entries for bug fixes by Mm Alder and Admiral Admiral. (diff)
downloadmeta-impy-27936532ebe6c71f78ecc35a50b75a92dddeb2c0.zip
meta-impy-27936532ebe6c71f78ecc35a50b75a92dddeb2c0.tar.gz
meta-impy-27936532ebe6c71f78ecc35a50b75a92dddeb2c0.tar.bz2
meta-impy-27936532ebe6c71f78ecc35a50b75a92dddeb2c0.tar.xz
Improved how opacity is displayed in color swatches.
Signed-off-by: Jacek Antonelli <jacek.antonelli@gmail.com>
Diffstat (limited to 'linden/indra/newview')
-rw-r--r--linden/indra/newview/llcolorswatch.cpp3
1 files changed, 1 insertions, 2 deletions
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()
219 gl_rect_2d(interior, mColor, TRUE); 219 gl_rect_2d(interior, mColor, TRUE);
220 LLColor4 opaque_color = mColor; 220 LLColor4 opaque_color = mColor;
221 opaque_color.mV[VALPHA] = 1.f; 221 opaque_color.mV[VALPHA] = 1.f;
222 gGL.color4fv(opaque_color.mV);
223 if (mAlphaGradientImage.notNull()) 222 if (mAlphaGradientImage.notNull())
224 { 223 {
225 gGL.pushMatrix(); 224 gGL.pushMatrix();
226 { 225 {
227 mAlphaGradientImage->draw(interior, mColor); 226 mAlphaGradientImage->draw(interior, opaque_color);
228 } 227 }
229 gGL.popMatrix(); 228 gGL.popMatrix();
230 } 229 }