diff options
Diffstat (limited to '')
-rw-r--r-- | linden/indra/newview/lltexturectrl.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/linden/indra/newview/lltexturectrl.cpp b/linden/indra/newview/lltexturectrl.cpp index 6b84be4..be0b8eb 100644 --- a/linden/indra/newview/lltexturectrl.cpp +++ b/linden/indra/newview/lltexturectrl.cpp | |||
@@ -5,7 +5,7 @@ | |||
5 | * | 5 | * |
6 | * $LicenseInfo:firstyear=2002&license=viewergpl$ | 6 | * $LicenseInfo:firstyear=2002&license=viewergpl$ |
7 | * | 7 | * |
8 | * Copyright (c) 2002-2008, Linden Research, Inc. | 8 | * Copyright (c) 2002-2009, Linden Research, Inc. |
9 | * | 9 | * |
10 | * Second Life Viewer Source Code | 10 | * Second Life Viewer Source Code |
11 | * The source code in this file ("Source Code") is provided by Linden Lab | 11 | * The source code in this file ("Source Code") is provided by Linden Lab |
@@ -479,9 +479,9 @@ void LLFloaterTexturePicker::draw() | |||
479 | LLRect local_rect = getLocalRect(); | 479 | LLRect local_rect = getLocalRect(); |
480 | if (gFocusMgr.childHasKeyboardFocus(this) && mOwner->isInVisibleChain() && mContextConeOpacity > 0.001f) | 480 | if (gFocusMgr.childHasKeyboardFocus(this) && mOwner->isInVisibleChain() && mContextConeOpacity > 0.001f) |
481 | { | 481 | { |
482 | LLGLSNoTexture no_texture; | 482 | gGL.getTexUnit(0)->unbind(LLTexUnit::TT_TEXTURE); |
483 | LLGLEnable(GL_CULL_FACE); | 483 | LLGLEnable(GL_CULL_FACE); |
484 | gGL.begin(LLVertexBuffer::QUADS); | 484 | gGL.begin(LLRender::QUADS); |
485 | { | 485 | { |
486 | gGL.color4f(0.f, 0.f, 0.f, CONTEXT_CONE_IN_ALPHA * mContextConeOpacity); | 486 | gGL.color4f(0.f, 0.f, 0.f, CONTEXT_CONE_IN_ALPHA * mContextConeOpacity); |
487 | gGL.vertex2i(owner_rect.mLeft, owner_rect.mTop); | 487 | gGL.vertex2i(owner_rect.mLeft, owner_rect.mTop); |