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()
 
 void LLDrawPoolGround::render(S32 pass)
 {
-        if (mDrawFace.empty())
+        if (mDrawFace.empty() || !gSavedSettings.getBOOL("RenderGround"))
         {
                 return;
         }       
         
         LLGLSPipelineSkyBox gls_skybox;
-        LLImageGL::unbindTexture(0, GL_TEXTURE_2D);
+        gGL.getTexUnit(0)->unbind(LLTexUnit::TT_TEXTURE);
+
         LLGLDepthTest gls_depth(GL_TRUE, GL_FALSE);
 
         LLGLClampToFarClip far_clip(glh_get_current_projection());