merge -r 122421-124917 viewer-2.0.0-2 -> viewer-2.0.0-3

ignore-dead-branch

1 files changed, 2 insertions, 67 deletions

diff --git a/indra/newview/lldrawpoolsky.cpp b/indra/newview/lldrawpoolsky.cpp
index 7f21adcc94..a9e0948ecf 100644
--- a/indra/newview/lldrawpoolsky.cpp
+++ b/indra/newview/lldrawpoolsky.cpp
@@ -43,7 +43,6 @@
 #include "llviewercamera.h"
 #include "llviewerimagelist.h"
 #include "llviewerregion.h"
-#include "llviewerwindow.h"
 #include "llvosky.h"
 #include "llworld.h" // To get water height
 #include "pipeline.h"
@@ -61,8 +60,8 @@ LLDrawPool *LLDrawPoolSky::instancePool()
 
 void LLDrawPoolSky::prerender()
 {
-	mVertexShaderLevel = LLViewerShaderMgr::instance()->getVertexShaderLevel(LLViewerShaderMgr::SHADER_ENVIRONMENT);
-//	gSky.mVOSkyp->updateGeometry(gSky.mVOSkyp->mDrawable);
+	mVertexShaderLevel = LLViewerShaderMgr::instance()->getVertexShaderLevel(LLViewerShaderMgr::SHADER_ENVIRONMENT); 
+	gSky.mVOSkyp->updateGeometry(gSky.mVOSkyp->mDrawable);
 }
 
 void LLDrawPoolSky::render(S32 pass)
@@ -97,7 +96,6 @@ void LLDrawPoolSky::render(S32 pass)
 	}
 	
 
-	LLVOSky *voskyp = gSky.mVOSkyp;
 	LLGLSPipelineSkyBox gls_skybox;
 
 	LLGLDepthTest gls_depth(GL_TRUE, GL_FALSE);
@@ -120,43 +118,9 @@ void LLDrawPoolSky::render(S32 pass)
 	{
 		renderSkyCubeFace(i);
 	}
-	
-	LLFace *hbfaces[3];
-	hbfaces[0] = NULL;
-	hbfaces[1] = NULL;
-	hbfaces[2] = NULL;
-	for (S32 curr_face = 0; curr_face < face_count; curr_face++)
-	{
-		LLFace* facep = mDrawFace[curr_face];
-		if (voskyp->isSameFace(LLVOSky::FACE_SUN, facep))
-		{
-			hbfaces[0] = facep;
-		}
-		if (voskyp->isSameFace(LLVOSky::FACE_MOON, facep))
-		{
-			hbfaces[1] = facep;
-		}
-		if (voskyp->isSameFace(LLVOSky::FACE_BLOOM, facep))
-		{
-			hbfaces[2] = facep;
-		}
-	}
 
 	LLGLEnable blend(GL_BLEND);
 
-	if (hbfaces[2])
-	{
-		// renderSunHalo(hbfaces[2]);
-	}
-	if (hbfaces[0])
-	{
-		// renderHeavenlyBody(0, hbfaces[0]);
-	}
-	if (hbfaces[1])
-	{
-		// renderHeavenlyBody(1, hbfaces[1]);
-	}
-
 	glPopMatrix();
 }
 
@@ -181,35 +145,6 @@ void LLDrawPoolSky::renderSkyCubeFace(U8 side)
 	}
 }
 
-void LLDrawPoolSky::renderHeavenlyBody(U8 hb, LLFace* face)
-{
-	if ( !mHB[hb]->getDraw() ) return;
-	if (! face->getGeomCount()) return;
-
-	LLImageGL* tex = face->getTexture();
-	gGL.getTexUnit(0)->bind(tex);
-	LLColor4 color(mHB[hb]->getInterpColor());
-	LLOverrideFaceColor override(this, color);
-	face->renderIndexed();
-}
-
-
-
-void LLDrawPoolSky::renderSunHalo(LLFace* face)
-{
-	if (! mHB[0]->getDraw()) return;
-	if (! face->getGeomCount()) return;
-
-	LLImageGL* tex = face->getTexture();
-	gGL.getTexUnit(0)->bind(tex);
-	LLColor4 color(mHB[0]->getInterpColor());
-	color.mV[3] = llclamp(mHB[0]->getHaloBrighness(), 0.f, 1.f);
-
-	LLOverrideFaceColor override(this, color);
-	face->renderIndexed();
-}
-
-
 void LLDrawPoolSky::renderForSelect()
 {
 }