diff options
Diffstat (limited to '')
-rw-r--r-- | linden/indra/newview/llviewerparceloverlay.cpp | 38 |
1 files changed, 32 insertions, 6 deletions
diff --git a/linden/indra/newview/llviewerparceloverlay.cpp b/linden/indra/newview/llviewerparceloverlay.cpp index e1373d0..281b644 100644 --- a/linden/indra/newview/llviewerparceloverlay.cpp +++ b/linden/indra/newview/llviewerparceloverlay.cpp | |||
@@ -36,6 +36,7 @@ | |||
36 | // indra includes | 36 | // indra includes |
37 | #include "llparcel.h" | 37 | #include "llparcel.h" |
38 | #include "llgl.h" | 38 | #include "llgl.h" |
39 | #include "llglimmediate.h" | ||
39 | #include "v4color.h" | 40 | #include "v4color.h" |
40 | #include "v2math.h" | 41 | #include "v2math.h" |
41 | 42 | ||
@@ -829,14 +830,12 @@ S32 LLViewerParcelOverlay::renderPropertyLines () | |||
829 | continue; | 830 | continue; |
830 | } | 831 | } |
831 | 832 | ||
832 | glBegin(GL_TRIANGLE_STRIP); | 833 | gGL.begin(GL_TRIANGLE_STRIP); |
833 | 834 | ||
834 | for (j = 0; j < vertex_per_edge; j++) | 835 | for (j = 0; j < vertex_per_edge; j++) |
835 | { | 836 | { |
836 | // JC - This doesn't work | 837 | gGL.color4ubv(colorp); |
837 | //glTexCoord2fv(mTexCoordArray + FLOATS_PER_TEX_COORD*offset); | 838 | gGL.vertex3fv(vertexp); |
838 | glColor4ubv(colorp); | ||
839 | glVertex3fv(vertexp); | ||
840 | 839 | ||
841 | colorp += BYTES_PER_COLOR; | 840 | colorp += BYTES_PER_COLOR; |
842 | vertexp += FLOATS_PER_VERTEX; | 841 | vertexp += FLOATS_PER_VERTEX; |
@@ -844,7 +843,34 @@ S32 LLViewerParcelOverlay::renderPropertyLines () | |||
844 | 843 | ||
845 | drawn += vertex_per_edge; | 844 | drawn += vertex_per_edge; |
846 | 845 | ||
847 | glEnd(); | 846 | gGL.end(); |
847 | |||
848 | LLGLDepthTest depth(GL_TRUE, GL_FALSE, GL_GREATER); | ||
849 | |||
850 | colorp = mColorArray + BYTES_PER_COLOR * i; | ||
851 | vertexp = mVertexArray + FLOATS_PER_VERTEX * i; | ||
852 | |||
853 | gGL.begin(GL_TRIANGLE_STRIP); | ||
854 | |||
855 | for (j = 0; j < vertex_per_edge; j++) | ||
856 | { | ||
857 | U8 color[4]; | ||
858 | color[0] = colorp[0]; | ||
859 | color[1] = colorp[1]; | ||
860 | color[2] = colorp[2]; | ||
861 | color[3] = colorp[3]/4; | ||
862 | |||
863 | gGL.color4ubv(color); | ||
864 | gGL.vertex3fv(vertexp); | ||
865 | |||
866 | colorp += BYTES_PER_COLOR; | ||
867 | vertexp += FLOATS_PER_VERTEX; | ||
868 | } | ||
869 | |||
870 | drawn += vertex_per_edge; | ||
871 | |||
872 | gGL.end(); | ||
873 | |||
848 | } | 874 | } |
849 | 875 | ||
850 | glPopMatrix(); | 876 | glPopMatrix(); |