diff options
Diffstat (limited to 'linden/indra/newview/lldrawpooltree.cpp')
-rw-r--r-- | linden/indra/newview/lldrawpooltree.cpp | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/linden/indra/newview/lldrawpooltree.cpp b/linden/indra/newview/lldrawpooltree.cpp index fd178dc..312c61c 100644 --- a/linden/indra/newview/lldrawpooltree.cpp +++ b/linden/indra/newview/lldrawpooltree.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 |
@@ -50,7 +50,7 @@ LLDrawPoolTree::LLDrawPoolTree(LLViewerImage *texturep) : | |||
50 | LLFacePool(POOL_TREE), | 50 | LLFacePool(POOL_TREE), |
51 | mTexturep(texturep) | 51 | mTexturep(texturep) |
52 | { | 52 | { |
53 | mTexturep->bind(0); | 53 | gGL.getTexUnit(0)->bind(mTexturep.get()); |
54 | mTexturep->setClamp(FALSE, FALSE); | 54 | mTexturep->setClamp(FALSE, FALSE); |
55 | } | 55 | } |
56 | 56 | ||
@@ -124,6 +124,7 @@ void LLDrawPoolTree::renderForSelect() | |||
124 | LLOverrideFaceColor color(this, 1.f, 1.f, 1.f, 1.f); | 124 | LLOverrideFaceColor color(this, 1.f, 1.f, 1.f, 1.f); |
125 | 125 | ||
126 | LLGLSObjectSelectAlpha gls_alpha; | 126 | LLGLSObjectSelectAlpha gls_alpha; |
127 | gGL.getTexUnit(0)->unbind(LLTexUnit::TT_TEXTURE); | ||
127 | 128 | ||
128 | gGL.setSceneBlendType(LLRender::BT_REPLACE); | 129 | gGL.setSceneBlendType(LLRender::BT_REPLACE); |
129 | gGL.setAlphaRejectSettings(LLRender::CF_GREATER, 0.5f); | 130 | gGL.setAlphaRejectSettings(LLRender::CF_GREATER, 0.5f); |
@@ -144,7 +145,7 @@ void LLDrawPoolTree::renderTree(BOOL selecting) | |||
144 | LLGLState normalize(GL_NORMALIZE, TRUE); | 145 | LLGLState normalize(GL_NORMALIZE, TRUE); |
145 | 146 | ||
146 | // Bind the texture for this tree. | 147 | // Bind the texture for this tree. |
147 | LLViewerImage::bindTexture(mTexturep,sDiffTex); | 148 | gGL.getTexUnit(sDiffTex)->bind(mTexturep.get()); |
148 | 149 | ||
149 | U32 indices_drawn = 0; | 150 | U32 indices_drawn = 0; |
150 | 151 | ||