diff options
| author | Jacek Antonelli | 2008-12-01 17:39:58 -0600 |
|---|---|---|
| committer | Jacek Antonelli | 2008-12-01 17:40:06 -0600 |
| commit | 7abecb48babe6a6f09bf6692ba55076546cfced9 (patch) | |
| tree | 8d18a88513fb97adf32c10aae78f4be1984942db /linden/indra/newview/lldrawpoolground.cpp | |
| parent | Second Life viewer sources 1.21.6 (diff) | |
| download | meta-impy-7abecb48babe6a6f09bf6692ba55076546cfced9.zip meta-impy-7abecb48babe6a6f09bf6692ba55076546cfced9.tar.gz meta-impy-7abecb48babe6a6f09bf6692ba55076546cfced9.tar.bz2 meta-impy-7abecb48babe6a6f09bf6692ba55076546cfced9.tar.xz | |
Second Life viewer sources 1.22.0-RC
Diffstat (limited to 'linden/indra/newview/lldrawpoolground.cpp')
| -rw-r--r-- | linden/indra/newview/lldrawpoolground.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/linden/indra/newview/lldrawpoolground.cpp b/linden/indra/newview/lldrawpoolground.cpp index 5698027..c8d110b 100644 --- a/linden/indra/newview/lldrawpoolground.cpp +++ b/linden/indra/newview/lldrawpoolground.cpp | |||
| @@ -63,13 +63,14 @@ void LLDrawPoolGround::prerender() | |||
| 63 | 63 | ||
| 64 | void LLDrawPoolGround::render(S32 pass) | 64 | void LLDrawPoolGround::render(S32 pass) |
| 65 | { | 65 | { |
| 66 | if (mDrawFace.empty()) | 66 | if (mDrawFace.empty() || !gSavedSettings.getBOOL("RenderGround")) |
| 67 | { | 67 | { |
| 68 | return; | 68 | return; |
| 69 | } | 69 | } |
| 70 | 70 | ||
| 71 | LLGLSPipelineSkyBox gls_skybox; | 71 | LLGLSPipelineSkyBox gls_skybox; |
| 72 | LLImageGL::unbindTexture(0, GL_TEXTURE_2D); | 72 | gGL.getTexUnit(0)->unbind(LLTexUnit::TT_TEXTURE); |
| 73 | |||
| 73 | LLGLDepthTest gls_depth(GL_TRUE, GL_FALSE); | 74 | LLGLDepthTest gls_depth(GL_TRUE, GL_FALSE); |
| 74 | 75 | ||
| 75 | LLGLClampToFarClip far_clip(glh_get_current_projection()); | 76 | LLGLClampToFarClip far_clip(glh_get_current_projection()); |