1 files changed, 12 insertions, 33 deletions

diff --git a/indra/newview/pipeline.cpp b/indra/newview/pipeline.cpp
index 49b39eb067..0898b0d53d 100644
--- a/indra/newview/pipeline.cpp
+++ b/indra/newview/pipeline.cpp
@@ -6075,9 +6075,7 @@ void LLPipeline::setupAvatarLights(bool for_edit)
     LLEnvironment& environment = LLEnvironment::instance();
     LLSettingsSky::ptr_t psky = environment.getCurrentSky();
 
-    bool sun_up         = environment.getIsSunUp();
-    bool moon_up        = environment.getIsMoonUp();
-    bool sun_is_primary = sun_up || !moon_up;
+    bool sun_up = environment.getIsSunUp();
 
 	if (for_edit)
 	{
@@ -6113,13 +6111,13 @@ void LLPipeline::setupAvatarLights(bool for_edit)
 	}
 	else if (gAvatarBacklight) // Always true (unless overridden in a devs .ini)
 	{
-        LLVector3 light_dir = sun_is_primary ? LLVector3(mSunDir) : LLVector3(mMoonDir);
+        LLVector3 light_dir = sun_up ? LLVector3(mSunDir) : LLVector3(mMoonDir);
 		LLVector3 opposite_pos = -light_dir;
 		LLVector3 orthog_light_pos = light_dir % LLVector3::z_axis;
 		LLVector4 backlight_pos = LLVector4(lerp(opposite_pos, orthog_light_pos, 0.3f), 0.0f);
 		backlight_pos.normalize();
 
-		LLColor4 light_diffuse = sun_is_primary ? mSunDiffuse : mMoonDiffuse;
+		LLColor4 light_diffuse = sun_up ? mSunDiffuse : mMoonDiffuse;
 
 		LLColor4 backlight_diffuse(1.f - light_diffuse.mV[VRED], 1.f - light_diffuse.mV[VGREEN], 1.f - light_diffuse.mV[VBLUE], 1.f);
 		F32 max_component = 0.001f;
@@ -6377,7 +6375,7 @@ void LLPipeline::setupHWLights(LLDrawPool* pool)
 		}
 		mMoonDiffuse.clamp();
 
-        LLVector4 light_dir = sun_up ? mSunDir     : mMoonDir;
+        LLVector4 light_dir = sun_up ? mSunDir : mMoonDir;
 
 		mHWLightColors[0] = mSunDiffuse;
 
@@ -8594,32 +8592,14 @@ void LLPipeline::renderDeferredLighting(LLRenderTarget* screen_target)
 		vert[1].set(-1,-3,0);
 		vert[2].set(3,1,0);
 
-        const LLEnvironment& environment = LLEnvironment::instance();
-
-        bool sun_up  = environment.getIsSunUp();
-        bool moon_up = environment.getIsMoonUp();
-		
-		{
-			setupHWLights(NULL); //to set mSun/MoonDir;
-			glh::vec4f tc(mSunDir.mV);
-			mat.mult_matrix_vec(tc);
+		setupHWLights(NULL); //to set mSun/MoonDir;
 
-            glh::vec4f tc_moon(mMoonDir.mV);
-            mTransformedMoonDir.set(tc_moon.v);
-            mTransformedMoonDir.normalize();
+		glh::vec4f tc(mSunDir.mV);
+		mat.mult_matrix_vec(tc);
+        mTransformedSunDir.set(tc.v);
 
-            bool sun_is_primary = sun_up || !moon_up;            
-            if (sun_is_primary)
-            {
-                mTransformedSunDir.set(tc.v);
-                mTransformedSunDir.normalize();
-            }
-            else
-            {
-                mTransformedSunDir.set(tc_moon.v);
-                mTransformedSunDir.normalize();
-            }            
-		}
+        glh::vec4f tc_moon(mMoonDir.mV);
+        mTransformedMoonDir.set(tc_moon.v);
 
 		gGL.pushMatrix();
 		gGL.loadIdentity();
@@ -10633,9 +10613,8 @@ void LLPipeline::generateSunShadow(LLCamera& camera)
 
     bool sun_up         = environment.getIsSunUp();
     bool moon_up        = environment.getIsMoonUp();
-    bool sun_is_primary = sun_up || !moon_up;
-    bool ignore_shadows = (sun_is_primary && (mSunDiffuse == LLColor4::black))
-                       || (moon_up        && (mMoonDiffuse == LLColor4::black))
+    bool ignore_shadows = (sun_up  && (mSunDiffuse == LLColor4::black))
+                       || (moon_up && (mMoonDiffuse == LLColor4::black))
                        || !(sun_up || moon_up);
 
 	if (ignore_shadows)