From bb214c30c3c35881d250ae3e299fd095ded5197c Mon Sep 17 00:00:00 2001
From: Graham Linden <graham@lindenlab.com>
Date: Fri, 31 May 2019 16:45:53 -0700
Subject: Make disables for parts of lighting not persist (too many weird bugs
 if people leave these enabled and forget).

---
 indra/newview/app_settings/settings.xml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml
index 1138410a07..500cb280fa 100644
--- a/indra/newview/app_settings/settings.xml
+++ b/indra/newview/app_settings/settings.xml
@@ -12361,7 +12361,7 @@
     <key>Comment</key>
     <string>If TRUE, ambient light has no effect</string>
     <key>Persist</key>
-    <integer>1</integer>
+    <integer>0</integer>
     <key>Type</key>
     <string>Boolean</string>
     <key>Value</key>
@@ -12372,7 +12372,7 @@
     <key>Comment</key>
     <string>If TRUE, sunlight has no effect</string>
     <key>Persist</key>
-    <integer>1</integer>
+    <integer>0</integer>
     <key>Type</key>
     <string>Boolean</string>
     <key>Value</key>
@@ -12383,7 +12383,7 @@
     <key>Comment</key>
     <string>If TRUE, local lights have no effect</string>
     <key>Persist</key>
-    <integer>1</integer>
+    <integer>0</integer>
     <key>Type</key>
     <string>Boolean</string>
     <key>Value</key>
-- 
cgit v1.2.3


From 9d73d103bc137a9de5ccf550b9ceaf61c419179a Mon Sep 17 00:00:00 2001
From: Graham Linden <graham@lindenlab.com>
Date: Mon, 3 Jun 2019 10:22:43 -0700
Subject: SL-11238, SL-11337

Tweak application of ambient in deferred soften light for class1/2
---
 indra/newview/app_settings/shaders/class1/deferred/softenLightF.glsl | 2 +-
 indra/newview/app_settings/shaders/class2/deferred/softenLightF.glsl | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/indra/newview/app_settings/shaders/class1/deferred/softenLightF.glsl b/indra/newview/app_settings/shaders/class1/deferred/softenLightF.glsl
index 5b03fbaa50..13e0cb5169 100644
--- a/indra/newview/app_settings/shaders/class1/deferred/softenLightF.glsl
+++ b/indra/newview/app_settings/shaders/class1/deferred/softenLightF.glsl
@@ -111,7 +111,7 @@ void main()
         vec3 sun_contrib = final_da * sunlit;
 
 #if !defined(AMBIENT_KILL)
-        color.rgb = amblit * 0.5;
+        color.rgb = pow(amblit, vec3(1.0/1.3));
         color.rgb *= ambient;
 #endif
 
diff --git a/indra/newview/app_settings/shaders/class2/deferred/softenLightF.glsl b/indra/newview/app_settings/shaders/class2/deferred/softenLightF.glsl
index 9492141b49..343e5c8ef5 100644
--- a/indra/newview/app_settings/shaders/class2/deferred/softenLightF.glsl
+++ b/indra/newview/app_settings/shaders/class2/deferred/softenLightF.glsl
@@ -120,6 +120,7 @@ void main()
 
 #if !defined(AMBIENT_KILL)
         color.rgb = amblit * 0.5;
+        color.rgb = pow(color.rgb, vec3(1.0/1.1));
         color.rgb *= ambient;
 #endif
 
-- 
cgit v1.2.3