Second Life viewer sources 1.22.0-RC

1 files changed, 4 insertions, 3 deletions

diff --git a/linden/indra/newview/lltoolmorph.cpp b/linden/indra/newview/lltoolmorph.cpp
index 2fbf4ae..9666e66 100644
--- a/linden/indra/newview/lltoolmorph.cpp
+++ b/linden/indra/newview/lltoolmorph.cpp
@@ -240,6 +240,7 @@ BOOL LLVisualParamHint::render()
         }
         avatarp->setVisualParamWeight(mVisualParam, mLastParamWeight);
         gGL.color4f(1,1,1,1);
+        mTexture->setInitialized(true);
         return TRUE;
 }
 
@@ -251,12 +252,12 @@ void LLVisualParamHint::draw()
 {
         if (!mIsVisible) return;
 
-        bindTexture();
+        gGL.getTexUnit(0)->bind(getTexture());
 
         gGL.color4f(1.f, 1.f, 1.f, 1.f);
 
         LLGLSUIDefault gls_ui;
-        gGL.begin(LLVertexBuffer::QUADS);
+        gGL.begin(LLRender::QUADS);
         {
                 gGL.texCoord2i(0, 1);
                 gGL.vertex2i(0, mHeight);
@@ -269,7 +270,7 @@ void LLVisualParamHint::draw()
         }
         gGL.end();
 
-        LLImageGL::unbindTexture(0, GL_TEXTURE_2D);
+        gGL.getTexUnit(0)->unbind(LLTexUnit::TT_TEXTURE);
 }
 
 //-----------------------------------------------------------------------------