Revert "port of LL renderpipeline/Kirstens S19 pipeline for bridging to Viewer 2 texture system"

This reverts commit 087e15e89930d51c3964329befb273ae3b2d330d.

Conflicts:

	linden/indra/newview/llsurface.cpp
	linden/indra/newview/llviewerwindow.cpp
	linden/indra/newview/llvoavatar.cpp
	linden/indra/newview/pipeline.cpp
	linden/indra/newview/pipeline.h

1 files changed, 4 insertions, 4 deletions

diff --git a/linden/indra/newview/llvosky.cpp b/linden/indra/newview/llvosky.cpp
index 817a510..8639b60 100644
--- a/linden/indra/newview/llvosky.cpp
+++ b/linden/indra/newview/llvosky.cpp
@@ -293,7 +293,7 @@ void LLSkyTex::create(const F32 brightness)
 
 void LLSkyTex::createGLImage(S32 which)
 {       
-        mImageGL[which]->createGLTexture(0, mImageRaw[which]);
+        mImageGL[which]->createGLTexture(0, mImageRaw[which], 0, TRUE, LLViewerImageBoostLevel::OTHER);
         mImageGL[which]->setAddressMode(LLTexUnit::TAM_CLAMP);
 }
 
@@ -1102,10 +1102,10 @@ BOOL LLVOSky::updateSky()
                                                            mLastTotalAmbient.mV[2] - mTotalAmbient.mV[2]);
 
                         if ( mForceUpdate 
-                                 || (((dot_lighting < LIGHT_DIRECTION_THRESHOLD)
+                                 || ((dot_lighting < LIGHT_DIRECTION_THRESHOLD)
                                  || (delta_color.length() > COLOR_CHANGE_THRESHOLD)
                                  || !mInitialized)
-                                && !direction.isExactlyZero()))
+                                && !direction.isExactlyZero())
                         {
                                 mLastLightingDirection = direction;
                                 mLastTotalAmbient = mTotalAmbient;
@@ -1187,7 +1187,7 @@ BOOL LLVOSky::updateSky()
         return TRUE;
 }
 
-void LLVOSky::updateTextures(LLAgent &agent)
+void LLVOSky::updateTextures()
 {
         if (mSunTexturep)
         {