diff options
| author | Brad Kittenbrink <brad@lindenlab.com> | 2008-02-27 18:58:14 +0000 |
|---|---|---|
| committer | Brad Kittenbrink <brad@lindenlab.com> | 2008-02-27 18:58:14 +0000 |
| commit | 6d52efe452aa8469e0343da1c7d108f3f52ab651 (patch) | |
| tree | a87be48e9840d7fc1f7ee514d7c7f994e71fdb3c /indra/newview/llcolorswatch.cpp | |
| parent | 6027ad2630b8650cabcf00628ee9b0d25bedd67f (diff) | |
Merge of windlight into release (QAR-286). This includes all changes in
windlight14 which have passed QA (up through r79932).
svn merge -r 80831:80833 svn+ssh://svn.lindenlab.com/svn/linden/branches/merge_windlight14_r80620
Diffstat (limited to 'indra/newview/llcolorswatch.cpp')
| -rw-r--r-- | indra/newview/llcolorswatch.cpp | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/indra/newview/llcolorswatch.cpp b/indra/newview/llcolorswatch.cpp index b2b29ffc9f..caf506a21e 100644 --- a/indra/newview/llcolorswatch.cpp +++ b/indra/newview/llcolorswatch.cpp @@ -39,6 +39,7 @@ // Project includes #include "llui.h" +#include "llglimmediate.h" #include "lluiconstants.h" #include "llviewerwindow.h" #include "llviewercontrol.h" @@ -215,23 +216,21 @@ void LLColorSwatchCtrl::draw() // Check state if ( mValid ) { - LLGLSTexture gls_texture; - // Draw the color swatch gl_rect_2d_checkerboard( interior ); gl_rect_2d(interior, mColor, TRUE); LLColor4 opaque_color = mColor; opaque_color.mV[VALPHA] = 1.f; - glColor4fv(opaque_color.mV); + gGL.color4fv(opaque_color.mV); if (mAlphaGradientImage.notNull()) { - glPushMatrix(); + gGL.pushMatrix(); { - glTranslatef((F32)interior.mLeft, (F32)interior.mBottom, 0.f); + gGL.translatef((F32)interior.mLeft, (F32)interior.mBottom, 0.f); LLViewerImage::bindTexture(mAlphaGradientImage); gl_rect_2d_simple_tex(interior.getWidth(), interior.getHeight()); } - glPopMatrix(); + gGL.popMatrix(); } } else |