diff options
Diffstat (limited to 'linden/indra/llui/llviewborder.cpp')
-rw-r--r-- | linden/indra/llui/llviewborder.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/linden/indra/llui/llviewborder.cpp b/linden/indra/llui/llviewborder.cpp index 8a5beea..ae24694 100644 --- a/linden/indra/llui/llviewborder.cpp +++ b/linden/indra/llui/llviewborder.cpp | |||
@@ -3,7 +3,7 @@ | |||
3 | * | 3 | * |
4 | * $LicenseInfo:firstyear=2001&license=viewergpl$ | 4 | * $LicenseInfo:firstyear=2001&license=viewergpl$ |
5 | * | 5 | * |
6 | * Copyright (c) 2001-2008, Linden Research, Inc. | 6 | * Copyright (c) 2001-2009, Linden Research, Inc. |
7 | * | 7 | * |
8 | * Second Life Viewer Source Code | 8 | * Second Life Viewer Source Code |
9 | * The source code in this file ("Source Code") is provided by Linden Lab | 9 | * The source code in this file ("Source Code") is provided by Linden Lab |
@@ -111,7 +111,7 @@ void LLViewBorder::draw() | |||
111 | 111 | ||
112 | void LLViewBorder::drawOnePixelLines() | 112 | void LLViewBorder::drawOnePixelLines() |
113 | { | 113 | { |
114 | LLGLSNoTexture uiNoTexture; | 114 | gGL.getTexUnit(0)->unbind(LLTexUnit::TT_TEXTURE); |
115 | 115 | ||
116 | LLColor4 top_color = mHighlightLight; | 116 | LLColor4 top_color = mHighlightLight; |
117 | LLColor4 bottom_color = mHighlightLight; | 117 | LLColor4 bottom_color = mHighlightLight; |
@@ -158,7 +158,7 @@ void LLViewBorder::drawOnePixelLines() | |||
158 | 158 | ||
159 | void LLViewBorder::drawTwoPixelLines() | 159 | void LLViewBorder::drawTwoPixelLines() |
160 | { | 160 | { |
161 | LLGLSNoTexture no_texture; | 161 | gGL.getTexUnit(0)->unbind(LLTexUnit::TT_TEXTURE); |
162 | 162 | ||
163 | LLColor4 focus_color = gFocusMgr.getFocusColor(); | 163 | LLColor4 focus_color = gFocusMgr.getFocusColor(); |
164 | 164 | ||
@@ -230,7 +230,7 @@ void LLViewBorder::drawTextures() | |||
230 | 230 | ||
231 | //gGL.color4fv(UI_VERTEX_COLOR.mV); | 231 | //gGL.color4fv(UI_VERTEX_COLOR.mV); |
232 | 232 | ||
233 | //mTexture->bind(); | 233 | //gGL.getTexUnit(0)->bind(mTexture); |
234 | //glTexParameteri( GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT ); | 234 | //glTexParameteri( GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT ); |
235 | //glTexParameteri( GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT ); | 235 | //glTexParameteri( GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT ); |
236 | 236 | ||
@@ -248,7 +248,7 @@ void LLViewBorder::drawTextureTrapezoid( F32 degrees, S32 width, S32 length, F32 | |||
248 | gGL.translatef(start_x, start_y, 0.f); | 248 | gGL.translatef(start_x, start_y, 0.f); |
249 | glRotatef( degrees, 0, 0, 1 ); | 249 | glRotatef( degrees, 0, 0, 1 ); |
250 | 250 | ||
251 | gGL.begin(LLVertexBuffer::QUADS); | 251 | gGL.begin(LLRender::QUADS); |
252 | { | 252 | { |
253 | // width, width /---------\ length-width, width // | 253 | // width, width /---------\ length-width, width // |
254 | // / \ // | 254 | // / \ // |