diff options
| author | Rider Linden <rider@lindenlab.com> | 2018-10-30 20:28:19 +0000 |
|---|---|---|
| committer | Rider Linden <rider@lindenlab.com> | 2018-10-30 20:28:19 +0000 |
| commit | 51ee9025026a396171052d180240b4ae23b03e9a (patch) | |
| tree | cb72d23ba0bac90ec16fb5f67990d5d4026e42ab /indra/newview | |
| parent | 7b6cd0859cbdf80f027bcec3948c7c165c7fe114 (diff) | |
| parent | d292ec7ee065c50e415c0ef06664ab6d428a022b (diff) | |
Merged in graham_linden/viewer-eep-fixes (pull request #173)
Fix OSX issue with ctor not recognizing version with defaulted arg.
Diffstat (limited to 'indra/newview')
| -rw-r--r-- | indra/newview/lldrawpoolsky.cpp | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/indra/newview/lldrawpoolsky.cpp b/indra/newview/lldrawpoolsky.cpp index 2e4506ce47..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(get_current_projection()); + 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]); |