From 3416b837dceb12c38eb4c128b5f8c0c858cbb9b9 Mon Sep 17 00:00:00 2001
From: Shyotl <Shyotl@gmail.com>
Date: Wed, 13 Nov 2013 02:31:55 -0600
Subject: [PATCH] Added setting 'SHAlwaysSoftenShadows' to soften shadows when
 ssao isn't enabled. Removed a couple dead settings.

---
 indra/newview/app_settings/settings_sh.xml | 33 ++++++++--------------
 indra/newview/pipeline.cpp                 |  3 +-
 2 files changed, 13 insertions(+), 23 deletions(-)

diff --git a/indra/newview/app_settings/settings_sh.xml b/indra/newview/app_settings/settings_sh.xml
index 732da64bf..998c3ff37 100644
--- a/indra/newview/app_settings/settings_sh.xml
+++ b/indra/newview/app_settings/settings_sh.xml
@@ -184,28 +184,6 @@
       <string>Boolean</string>
       <key>Value</key>
       <integer>0</integer>
-    </map>
-    <key>SHPackDeferredNormals</key>
-    <map>
-      <key>Comment</key>
-      <string>Pack deferred normals into two components.</string>
-      <key>Persist</key>
-      <integer>1</integer>
-      <key>Type</key>
-      <string>Boolean</string>
-      <key>Value</key>
-      <integer>0</integer>
-    </map>
-    <key>SHPrecisionDeferredNormals</key>
-    <map>
-      <key>Comment</key>
-      <string>Enable usage of RGB10A2 for the deferred normalMap format. Reduces normalmapping artifacts.</string>
-      <key>Persist</key>
-      <integer>1</integer>
-      <key>Type</key>
-      <string>Boolean</string>
-      <key>Value</key>
-      <integer>0</integer>
     </map>
 	<key>SHOcclusionFudge</key>
     <map>
@@ -240,5 +218,16 @@
       <key>Value</key>
       <real>0.09</real>
     </map>
+    <key>SHAlwaysSoftenShadows</key>
+    <map>
+      <key>Comment</key>
+      <string>Enable optional blur pass on shadows.</string>
+      <key>Persist</key>
+      <integer>1</integer>
+      <key>Type</key>
+      <string>Boolean</string>
+      <key>Value</key>
+      <real>1</real>
+    </map>
   </map>
 </llsd>
diff --git a/indra/newview/pipeline.cpp b/indra/newview/pipeline.cpp
index 18ba87865..42180df08 100644
--- a/indra/newview/pipeline.cpp
+++ b/indra/newview/pipeline.cpp
@@ -7921,7 +7921,8 @@ void LLPipeline::renderDeferredLighting()
 			mDeferredLight.flush();
 		}
 
-		if (RenderDeferredSSAO)
+		static const LLCachedControl<bool> SHAlwaysSoftenShadows("SHAlwaysSoftenShadows",true);
+		if (RenderDeferredSSAO || (RenderShadowDetail > 0 && SHAlwaysSoftenShadows))
 		{ //soften direct lighting lightmap
 			LLFastTimer ftm(FTM_SOFTEN_SHADOW);
 			//blur lightmap