Second Life viewer sources 1.22.0-RC

1 files changed, 3 insertions, 3 deletions

diff --git a/linden/indra/newview/llfloatercolorpicker.cpp b/linden/indra/newview/llfloatercolorpicker.cpp
index 1ffbeb3..9b2a5f6 100644
--- a/linden/indra/newview/llfloatercolorpicker.cpp
+++ b/linden/indra/newview/llfloatercolorpicker.cpp
@@ -165,7 +165,7 @@ createUI ()
                 }
         }
         mRGBImage = new LLImageGL ( (LLImageRaw*)raw, FALSE );
-        mRGBImage->bind();
+        gGL.getTexUnit(0)->bind(mRGBImage);
         mRGBImage->setClamp(TRUE, TRUE);
         
         // create palette
@@ -543,9 +543,9 @@ void LLFloaterColorPicker::draw()
         LLRect local_rect = getLocalRect();
         if (gFocusMgr.childHasKeyboardFocus(this) && mSwatch->isInVisibleChain() && mContextConeOpacity > 0.001f)
         {
-                LLGLSNoTexture no_texture;
+                gGL.getTexUnit(0)->unbind(LLTexUnit::TT_TEXTURE);
                 LLGLEnable(GL_CULL_FACE);
-                gGL.begin(LLVertexBuffer::QUADS);
+                gGL.begin(LLRender::QUADS);
                 {
                         gGL.color4f(0.f, 0.f, 0.f, CONTEXT_CONE_IN_ALPHA * mContextConeOpacity);
                         gGL.vertex2i(swatch_rect.mLeft, swatch_rect.mTop);