diff options
Diffstat (limited to 'linden/indra/newview/lltoolmorph.cpp')
-rw-r--r-- | linden/indra/newview/lltoolmorph.cpp | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/linden/indra/newview/lltoolmorph.cpp b/linden/indra/newview/lltoolmorph.cpp index 2fbf4ae..a23b4ce 100644 --- a/linden/indra/newview/lltoolmorph.cpp +++ b/linden/indra/newview/lltoolmorph.cpp | |||
@@ -4,7 +4,7 @@ | |||
4 | * | 4 | * |
5 | * $LicenseInfo:firstyear=2001&license=viewergpl$ | 5 | * $LicenseInfo:firstyear=2001&license=viewergpl$ |
6 | * | 6 | * |
7 | * Copyright (c) 2001-2008, Linden Research, Inc. | 7 | * Copyright (c) 2001-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 |
@@ -240,6 +240,7 @@ BOOL LLVisualParamHint::render() | |||
240 | } | 240 | } |
241 | avatarp->setVisualParamWeight(mVisualParam, mLastParamWeight); | 241 | avatarp->setVisualParamWeight(mVisualParam, mLastParamWeight); |
242 | gGL.color4f(1,1,1,1); | 242 | gGL.color4f(1,1,1,1); |
243 | mTexture->setGLTextureCreated(true); | ||
243 | return TRUE; | 244 | return TRUE; |
244 | } | 245 | } |
245 | 246 | ||
@@ -251,12 +252,12 @@ void LLVisualParamHint::draw() | |||
251 | { | 252 | { |
252 | if (!mIsVisible) return; | 253 | if (!mIsVisible) return; |
253 | 254 | ||
254 | bindTexture(); | 255 | gGL.getTexUnit(0)->bind(getTexture()); |
255 | 256 | ||
256 | gGL.color4f(1.f, 1.f, 1.f, 1.f); | 257 | gGL.color4f(1.f, 1.f, 1.f, 1.f); |
257 | 258 | ||
258 | LLGLSUIDefault gls_ui; | 259 | LLGLSUIDefault gls_ui; |
259 | gGL.begin(LLVertexBuffer::QUADS); | 260 | gGL.begin(LLRender::QUADS); |
260 | { | 261 | { |
261 | gGL.texCoord2i(0, 1); | 262 | gGL.texCoord2i(0, 1); |
262 | gGL.vertex2i(0, mHeight); | 263 | gGL.vertex2i(0, mHeight); |
@@ -269,7 +270,7 @@ void LLVisualParamHint::draw() | |||
269 | } | 270 | } |
270 | gGL.end(); | 271 | gGL.end(); |
271 | 272 | ||
272 | LLImageGL::unbindTexture(0, GL_TEXTURE_2D); | 273 | gGL.getTexUnit(0)->unbind(LLTexUnit::TT_TEXTURE); |
273 | } | 274 | } |
274 | 275 | ||
275 | //----------------------------------------------------------------------------- | 276 | //----------------------------------------------------------------------------- |