Second Life viewer sources 1.22.0-RC

1 files changed, 4 insertions, 4 deletions

diff --git a/linden/indra/llui/llviewborder.cpp b/linden/indra/llui/llviewborder.cpp
index 8a5beea..a1c26d6 100644
--- a/linden/indra/llui/llviewborder.cpp
+++ b/linden/indra/llui/llviewborder.cpp
@@ -111,7 +111,7 @@ void LLViewBorder::draw()
 
 void LLViewBorder::drawOnePixelLines()
 {
-        LLGLSNoTexture uiNoTexture;
+        gGL.getTexUnit(0)->unbind(LLTexUnit::TT_TEXTURE);
 
         LLColor4 top_color = mHighlightLight;
         LLColor4 bottom_color = mHighlightLight;
@@ -158,7 +158,7 @@ void LLViewBorder::drawOnePixelLines()
 
 void LLViewBorder::drawTwoPixelLines()
 {
-        LLGLSNoTexture no_texture;
+        gGL.getTexUnit(0)->unbind(LLTexUnit::TT_TEXTURE);
         
         LLColor4 focus_color = gFocusMgr.getFocusColor();
 
@@ -230,7 +230,7 @@ void LLViewBorder::drawTextures()
 
         //gGL.color4fv(UI_VERTEX_COLOR.mV);
 
-        //mTexture->bind();
+        //gGL.getTexUnit(0)->bind(mTexture);
         //glTexParameteri( GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT );
         //glTexParameteri( GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT );
 
@@ -248,7 +248,7 @@ void LLViewBorder::drawTextureTrapezoid( F32 degrees, S32 width, S32 length, F32
                 gGL.translatef(start_x, start_y, 0.f);
                 glRotatef( degrees, 0, 0, 1 );
 
-                gGL.begin(LLVertexBuffer::QUADS);
+                gGL.begin(LLRender::QUADS);
                 {
                         //      width, width   /---------\ length-width, width          //
                         //                                    /           \                                                     //