diff options
| author | Steven Bennetts <steve@lindenlab.com> | 2008-05-09 20:57:23 +0000 |
|---|---|---|
| committer | Steven Bennetts <steve@lindenlab.com> | 2008-05-09 20:57:23 +0000 |
| commit | 783e05058c5d74984ab554fdc60aa06839b9b5c9 (patch) | |
| tree | b40ca6762c7546b65db3966c04ef545a23643f21 /indra/newview/llviewerparceloverlay.cpp | |
| parent | dbe0176552e070baef9a693252cb47dda97d1fb4 (diff) | |
QAR-537 Viewer 1.20 RC 6
merge -r 86279:86925 Branch_1-20-Viewer -> release
Diffstat (limited to 'indra/newview/llviewerparceloverlay.cpp')
| -rw-r--r-- | indra/newview/llviewerparceloverlay.cpp | 43 |
1 files changed, 24 insertions, 19 deletions
diff --git a/indra/newview/llviewerparceloverlay.cpp b/indra/newview/llviewerparceloverlay.cpp index d190d2f12c..342d8c7222 100644 --- a/indra/newview/llviewerparceloverlay.cpp +++ b/indra/newview/llviewerparceloverlay.cpp @@ -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; @@ -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(); + } } |