diff options
Diffstat (limited to 'linden/indra/newview/llviewerparceloverlay.cpp')
-rw-r--r-- | linden/indra/newview/llviewerparceloverlay.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/linden/indra/newview/llviewerparceloverlay.cpp b/linden/indra/newview/llviewerparceloverlay.cpp index b50ddb6..dc2e0db 100644 --- a/linden/indra/newview/llviewerparceloverlay.cpp +++ b/linden/indra/newview/llviewerparceloverlay.cpp | |||
@@ -4,7 +4,7 @@ | |||
4 | * | 4 | * |
5 | * $LicenseInfo:firstyear=2002&license=viewergpl$ | 5 | * $LicenseInfo:firstyear=2002&license=viewergpl$ |
6 | * | 6 | * |
7 | * Copyright (c) 2002-2008, Linden Research, Inc. | 7 | * Copyright (c) 2002-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 |
@@ -72,7 +72,7 @@ LLViewerParcelOverlay::LLViewerParcelOverlay(LLViewerRegion* region, F32 region_ | |||
72 | mImageRaw = new LLImageRaw(mParcelGridsPerEdge, mParcelGridsPerEdge, OVERLAY_IMG_COMPONENTS); | 72 | mImageRaw = new LLImageRaw(mParcelGridsPerEdge, mParcelGridsPerEdge, OVERLAY_IMG_COMPONENTS); |
73 | mTexture->createGLTexture(0, mImageRaw); | 73 | mTexture->createGLTexture(0, mImageRaw); |
74 | gGL.getTexUnit(0)->activate(); | 74 | gGL.getTexUnit(0)->activate(); |
75 | mTexture->bind(0); | 75 | gGL.getTexUnit(0)->bind(mTexture); |
76 | mTexture->setClamp(TRUE, TRUE); | 76 | mTexture->setClamp(TRUE, TRUE); |
77 | mTexture->setMipFilterNearest(TRUE); | 77 | mTexture->setMipFilterNearest(TRUE); |
78 | 78 | ||
@@ -748,7 +748,7 @@ S32 LLViewerParcelOverlay::renderPropertyLines () | |||
748 | LLSurface& land = mRegion->getLand(); | 748 | LLSurface& land = mRegion->getLand(); |
749 | 749 | ||
750 | LLGLSUIDefault gls_ui; // called from pipeline | 750 | LLGLSUIDefault gls_ui; // called from pipeline |
751 | LLGLSNoTexture gls_no_texture; | 751 | gGL.getTexUnit(0)->unbind(LLTexUnit::TT_TEXTURE); |
752 | LLGLDepthTest mDepthTest(GL_TRUE); | 752 | LLGLDepthTest mDepthTest(GL_TRUE); |
753 | 753 | ||
754 | // Find camera height off the ground (not from zero) | 754 | // Find camera height off the ground (not from zero) |
@@ -826,7 +826,7 @@ S32 LLViewerParcelOverlay::renderPropertyLines () | |||
826 | continue; | 826 | continue; |
827 | } | 827 | } |
828 | 828 | ||
829 | gGL.begin(LLVertexBuffer::TRIANGLE_STRIP); | 829 | gGL.begin(LLRender::TRIANGLE_STRIP); |
830 | 830 | ||
831 | for (j = 0; j < vertex_per_edge; j++) | 831 | for (j = 0; j < vertex_per_edge; j++) |
832 | { | 832 | { |
@@ -848,7 +848,7 @@ S32 LLViewerParcelOverlay::renderPropertyLines () | |||
848 | colorp = mColorArray + BYTES_PER_COLOR * i; | 848 | colorp = mColorArray + BYTES_PER_COLOR * i; |
849 | vertexp = mVertexArray + FLOATS_PER_VERTEX * i; | 849 | vertexp = mVertexArray + FLOATS_PER_VERTEX * i; |
850 | 850 | ||
851 | gGL.begin(LLVertexBuffer::TRIANGLE_STRIP); | 851 | gGL.begin(LLRender::TRIANGLE_STRIP); |
852 | 852 | ||
853 | for (j = 0; j < vertex_per_edge; j++) | 853 | for (j = 0; j < vertex_per_edge; j++) |
854 | { | 854 | { |