aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden/indra/newview/llprogressview.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'linden/indra/newview/llprogressview.cpp')
-rw-r--r--linden/indra/newview/llprogressview.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/linden/indra/newview/llprogressview.cpp b/linden/indra/newview/llprogressview.cpp
index 123c583..a38aada 100644
--- a/linden/indra/newview/llprogressview.cpp
+++ b/linden/indra/newview/llprogressview.cpp
@@ -4,7 +4,7 @@
4 * 4 *
5 * $LicenseInfo:firstyear=2002&license=viewergpl$ 5 * $LicenseInfo:firstyear=2002&license=viewergpl$
6 * 6 *
7 * Copyright (c) 2002-2008, Linden Research, Inc. 7 * Copyright (c) 2002-2009, Linden Research, Inc.
8 * 8 *
9 * Second Life Viewer Source Code 9 * Second Life Viewer Source Code
10 * The source code in this file ("Source Code") is provided by Linden Lab 10 * The source code in this file ("Source Code") is provided by Linden Lab
@@ -208,7 +208,7 @@ void LLProgressView::draw()
208 if (gStartImageGL) 208 if (gStartImageGL)
209 { 209 {
210 LLGLSUIDefault gls_ui; 210 LLGLSUIDefault gls_ui;
211 LLViewerImage::bindTexture(gStartImageGL); 211 gGL.getTexUnit(0)->bind(gStartImageGL);
212 gGL.color4f(1.f, 1.f, 1.f, mFadeTimer.getStarted() ? clamp_rescale(mFadeTimer.getElapsedTimeF32(), 0.f, FADE_IN_TIME, 1.f, 0.f) : 1.f); 212 gGL.color4f(1.f, 1.f, 1.f, mFadeTimer.getStarted() ? clamp_rescale(mFadeTimer.getElapsedTimeF32(), 0.f, FADE_IN_TIME, 1.f, 0.f) : 1.f);
213 F32 image_aspect = (F32)gStartImageWidth / (F32)gStartImageHeight; 213 F32 image_aspect = (F32)gStartImageWidth / (F32)gStartImageHeight;
214 F32 view_aspect = (F32)width / (F32)height; 214 F32 view_aspect = (F32)width / (F32)height;
@@ -224,11 +224,11 @@ void LLProgressView::draw()
224 glScalef(1.f, view_aspect / image_aspect, 1.f); 224 glScalef(1.f, view_aspect / image_aspect, 1.f);
225 } 225 }
226 gl_rect_2d_simple_tex( getRect().getWidth(), getRect().getHeight() ); 226 gl_rect_2d_simple_tex( getRect().getWidth(), getRect().getHeight() );
227 gStartImageGL->unbindTexture(0, GL_TEXTURE_2D); 227 gGL.getTexUnit(0)->unbind(LLTexUnit::TT_TEXTURE);
228 } 228 }
229 else 229 else
230 { 230 {
231 LLGLSNoTexture gls_no_texture; 231 gGL.getTexUnit(0)->unbind(LLTexUnit::TT_TEXTURE);
232 gGL.color4f(0.f, 0.f, 0.f, 1.f); 232 gGL.color4f(0.f, 0.f, 0.f, 1.f);
233 gl_rect_2d(getRect()); 233 gl_rect_2d(getRect());
234 } 234 }