1 files changed, 26 insertions, 21 deletions

diff --git a/linden/indra/newview/llviewerparceloverlay.cpp b/linden/indra/newview/llviewerparceloverlay.cpp
index 7d0b2b4..b50ddb6 100644
--- a/linden/indra/newview/llviewerparceloverlay.cpp
+++ b/linden/indra/newview/llviewerparceloverlay.cpp
@@ -36,7 +36,7 @@
 // indra includes
 #include "llparcel.h"
 #include "llgl.h"
-#include "llglimmediate.h"
+#include "llrender.h"
 #include "v4color.h"
 #include "v2math.h"
 
@@ -48,6 +48,8 @@
 #include "llagent.h"
 #include "llviewercamera.h"
 #include "llviewerimagelist.h"
+#include "llselectmgr.h"
+#include "llfloatertools.h"
 #include "llglheaders.h"
 
 const U8  OVERLAY_IMG_COMPONENTS = 4;
@@ -69,7 +71,7 @@ LLViewerParcelOverlay::LLViewerParcelOverlay(LLViewerRegion* region, F32 region_
         mTexture = new LLImageGL(FALSE);
         mImageRaw = new LLImageRaw(mParcelGridsPerEdge, mParcelGridsPerEdge, OVERLAY_IMG_COMPONENTS);
         mTexture->createGLTexture(0, mImageRaw);
-        glActiveTextureARB(GL_TEXTURE0_ARB);
+        gGL.getTexUnit(0)->activate();
         mTexture->bind(0);
         mTexture->setClamp(TRUE, TRUE);
         mTexture->setMipFilterNearest(TRUE);
@@ -839,31 +841,34 @@ S32 LLViewerParcelOverlay::renderPropertyLines	()
 
                 gGL.end();
 
-                LLGLDepthTest depth(GL_TRUE, GL_FALSE, GL_GREATER);
-                
-                colorp  = mColorArray  + BYTES_PER_COLOR   * i;
-                vertexp = mVertexArray + FLOATS_PER_VERTEX * i;
+                if (LLSelectMgr::sRenderHiddenSelections && gFloaterTools && gFloaterTools->getVisible())
+                {
+                        LLGLDepthTest depth(GL_TRUE, GL_FALSE, GL_GREATER);
+                        
+                        colorp  = mColorArray  + BYTES_PER_COLOR   * i;
+                        vertexp = mVertexArray + FLOATS_PER_VERTEX * i;
 
-                gGL.begin(LLVertexBuffer::TRIANGLE_STRIP);
+                        gGL.begin(LLVertexBuffer::TRIANGLE_STRIP);
 
-                for (j = 0; j < vertex_per_edge; j++)
-                {
-                        U8 color[4];
-                        color[0] = colorp[0];
-                        color[1] = colorp[1];
-                        color[2] = colorp[2];
-                        color[3] = colorp[3]/4;
+                        for (j = 0; j < vertex_per_edge; j++)
+                        {
+                                U8 color[4];
+                                color[0] = colorp[0];
+                                color[1] = colorp[1];
+                                color[2] = colorp[2];
+                                color[3] = colorp[3]/4;
 
-                        gGL.color4ubv(color);
-                        gGL.vertex3fv(vertexp);
+                                gGL.color4ubv(color);
+                                gGL.vertex3fv(vertexp);
 
-                        colorp  += BYTES_PER_COLOR;
-                        vertexp += FLOATS_PER_VERTEX;                   
-                }
+                                colorp  += BYTES_PER_COLOR;
+                                vertexp += FLOATS_PER_VERTEX;                   
+                        }
 
-                drawn += vertex_per_edge;
+                        drawn += vertex_per_edge;
 
-                gGL.end();
+                        gGL.end();
+                }
                 
         }