diff options
Diffstat (limited to 'linden/indra/newview/lldrawpoolground.cpp')
-rw-r--r-- | linden/indra/newview/lldrawpoolground.cpp | 14 |
1 files changed, 3 insertions, 11 deletions
diff --git a/linden/indra/newview/lldrawpoolground.cpp b/linden/indra/newview/lldrawpoolground.cpp index 6ff7f06..dc5e397 100644 --- a/linden/indra/newview/lldrawpoolground.cpp +++ b/linden/indra/newview/lldrawpoolground.cpp | |||
@@ -72,15 +72,10 @@ void LLDrawPoolGround::render(S32 pass) | |||
72 | glEnableClientState(GL_VERTEX_ARRAY); | 72 | glEnableClientState(GL_VERTEX_ARRAY); |
73 | 73 | ||
74 | LLGLSPipelineSkyBox gls_skybox; | 74 | LLGLSPipelineSkyBox gls_skybox; |
75 | LLGLDisable tex(GL_TEXTURE_2D); | 75 | LLImageGL::unbindTexture(0, GL_TEXTURE_2D); |
76 | LLGLDepthTest gls_depth(GL_FALSE, GL_FALSE); | 76 | LLGLDepthTest gls_depth(GL_TRUE, GL_FALSE); |
77 | 77 | ||
78 | glMatrixMode( GL_PROJECTION ); | 78 | LLGLClampToFarClip far_clip(glh_get_current_projection()); |
79 | |||
80 | glPushMatrix(); | ||
81 | //gViewerWindow->setup3DRender(); | ||
82 | |||
83 | glMatrixMode(GL_MODELVIEW); | ||
84 | 79 | ||
85 | F32 water_height = gAgent.getRegion()->getWaterHeight(); | 80 | F32 water_height = gAgent.getRegion()->getWaterHeight(); |
86 | glPushMatrix(); | 81 | glPushMatrix(); |
@@ -94,9 +89,6 @@ void LLDrawPoolGround::render(S32 pass) | |||
94 | LLOverrideFaceColor col(this, gSky.mVOSkyp->getGLFogColor()); | 89 | LLOverrideFaceColor col(this, gSky.mVOSkyp->getGLFogColor()); |
95 | facep->renderIndexed(); | 90 | facep->renderIndexed(); |
96 | 91 | ||
97 | glMatrixMode( GL_PROJECTION ); | ||
98 | glPopMatrix(); | ||
99 | glMatrixMode( GL_MODELVIEW ); | ||
100 | glPopMatrix(); | 92 | glPopMatrix(); |
101 | } | 93 | } |
102 | 94 | ||