aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden/indra/newview/lltoolbrush.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'linden/indra/newview/lltoolbrush.cpp')
-rw-r--r--linden/indra/newview/lltoolbrush.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/linden/indra/newview/lltoolbrush.cpp b/linden/indra/newview/lltoolbrush.cpp
index 214d773..46b36d9 100644
--- a/linden/indra/newview/lltoolbrush.cpp
+++ b/linden/indra/newview/lltoolbrush.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
@@ -491,7 +491,7 @@ void LLToolBrushLand::renderOverlay(LLSurface& land, const LLVector3& pos_region
491 const LLVector3& pos_world) 491 const LLVector3& pos_world)
492{ 492{
493 glMatrixMode(GL_MODELVIEW); 493 glMatrixMode(GL_MODELVIEW);
494 LLGLSNoTexture gls_no_texture; 494 gGL.getTexUnit(0)->unbind(LLTexUnit::TT_TEXTURE);
495 LLGLDepthTest mDepthTest(GL_TRUE); 495 LLGLDepthTest mDepthTest(GL_TRUE);
496 glPushMatrix(); 496 glPushMatrix();
497 gGL.color4fv(OVERLAY_COLOR.mV); 497 gGL.color4fv(OVERLAY_COLOR.mV);
@@ -503,7 +503,7 @@ void LLToolBrushLand::renderOverlay(LLSurface& land, const LLVector3& pos_region
503 S32 radioAction = gSavedSettings.getS32("RadioLandBrushAction"); 503 S32 radioAction = gSavedSettings.getS32("RadioLandBrushAction");
504 F32 force = gSavedSettings.getF32("LandBrushForce"); // .1 to 100? 504 F32 force = gSavedSettings.getF32("LandBrushForce"); // .1 to 100?
505 505
506 gGL.begin(LLVertexBuffer::LINES); 506 gGL.begin(LLRender::LINES);
507 for(S32 di = -half_edge; di <= half_edge; di++) 507 for(S32 di = -half_edge; di <= half_edge; di++)
508 { 508 {
509 if((i+di) < 0 || (i+di) >= (S32)land.mGridsPerEdge) continue; 509 if((i+di) < 0 || (i+di) >= (S32)land.mGridsPerEdge) continue;