aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden/indra/newview/lltoolbrush.cpp
diff options
context:
space:
mode:
authorJacek Antonelli2008-12-01 17:39:58 -0600
committerJacek Antonelli2008-12-01 17:40:06 -0600
commit7abecb48babe6a6f09bf6692ba55076546cfced9 (patch)
tree8d18a88513fb97adf32c10aae78f4be1984942db /linden/indra/newview/lltoolbrush.cpp
parentSecond Life viewer sources 1.21.6 (diff)
downloadmeta-impy-7abecb48babe6a6f09bf6692ba55076546cfced9.zip
meta-impy-7abecb48babe6a6f09bf6692ba55076546cfced9.tar.gz
meta-impy-7abecb48babe6a6f09bf6692ba55076546cfced9.tar.bz2
meta-impy-7abecb48babe6a6f09bf6692ba55076546cfced9.tar.xz
Second Life viewer sources 1.22.0-RC
Diffstat (limited to 'linden/indra/newview/lltoolbrush.cpp')
-rw-r--r--linden/indra/newview/lltoolbrush.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/linden/indra/newview/lltoolbrush.cpp b/linden/indra/newview/lltoolbrush.cpp
index 0869cf3..6391789 100644
--- a/linden/indra/newview/lltoolbrush.cpp
+++ b/linden/indra/newview/lltoolbrush.cpp
@@ -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;