Merged in graham_linden/viewer-eep-g (pull request #413)

SL-11238, SL-11337

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>

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
 

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