From 17df1215b031a353fd8b2373774be8a81abfa781 Mon Sep 17 00:00:00 2001 From: Graham Linden Date: Tue, 30 Oct 2018 21:12:22 +0100 Subject: Fix OSX issue with ctor not recognizing version with defaulted arg. --- indra/newview/lldrawpoolsky.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/indra/newview/lldrawpoolsky.cpp b/indra/newview/lldrawpoolsky.cpp index 2e4506ce47..a04ebcddee 100644 --- a/indra/newview/lldrawpoolsky.cpp +++ b/indra/newview/lldrawpoolsky.cpp @@ -102,7 +102,7 @@ void LLDrawPoolSky::render(S32 pass) LLGLDepthTest gls_depth(GL_TRUE, GL_FALSE); - LLGLSquashToFarClip far_clip(get_current_projection()); + LLGLSquashToFarClip far_clip; LLGLEnable fog_enable( (mVertexShaderLevel < 1 && LLViewerCamera::getInstance()->cameraUnderWater()) ? GL_FOG : 0); -- cgit v1.2.3 From d292ec7ee065c50e415c0ef06664ab6d428a022b Mon Sep 17 00:00:00 2001 From: Graham Linden Date: Tue, 30 Oct 2018 21:25:52 +0100 Subject: Better OSX clean up. --- indra/newview/lldrawpoolsky.cpp | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/indra/newview/lldrawpoolsky.cpp b/indra/newview/lldrawpoolsky.cpp index a04ebcddee..4d4711d7c9 100644 --- a/indra/newview/lldrawpoolsky.cpp +++ b/indra/newview/lldrawpoolsky.cpp @@ -98,18 +98,10 @@ void LLDrawPoolSky::render(S32 pass) } - LLGLSPipelineSkyBox gls_skybox; - - LLGLDepthTest gls_depth(GL_TRUE, GL_FALSE); - - LLGLSquashToFarClip far_clip; + LLGLSPipelineDepthTestSkyBox gls_skybox(true, false); LLGLEnable fog_enable( (mVertexShaderLevel < 1 && LLViewerCamera::getInstance()->cameraUnderWater()) ? GL_FOG : 0); - gPipeline.disableLights(); - - LLGLDisable clip(GL_CLIP_PLANE0); - gGL.pushMatrix(); LLVector3 origin = LLViewerCamera::getInstance()->getOrigin(); gGL.translatef(origin.mV[0], origin.mV[1], origin.mV[2]); -- cgit v1.2.3