Back out changes causing broken shadows and other render shenanigans.

1 files changed, 3 insertions, 11 deletions

diff --git a/indra/llrender/llshadermgr.cpp b/indra/llrender/llshadermgr.cpp
index 55e4ecda2a..d6fe35e2ca 100644
--- a/indra/llrender/llshadermgr.cpp
+++ b/indra/llrender/llshadermgr.cpp
@@ -186,23 +186,15 @@ BOOL LLShaderMgr::attachShaderFeatures(LLGLSLShader * shader)
 		}
 	}
 
-	// NOTE order of shader object attaching is VERY IMPORTANT!!!
-    if (features->isDeferred || features->hasShadows)
-	{
-		if (!shader->attachObject("deferred/deferredUtil.glsl"))
-		{
-			return FALSE;
-		}
-	}
-
-    if (features->hasIndirect)
+    if (features->calculatesLighting || features->calculatesAtmospherics)
 	{
-		if (!shader->attachObject("deferred/indirect.glsl"))
+		if (!shader->attachObject("windlight/atmosphericsHelpersF.glsl"))
 		{
 			return FALSE;
 		}
 	}
 
+	// NOTE order of shader object attaching is VERY IMPORTANT!!!
 	if (features->hasGamma)
 	{
 		if (!shader->attachObject("windlight/gammaF.glsl"))