From 97826b555b74044887b765e7a029e2763ea86308 Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Mon, 2 Dec 2024 21:22:04 +0200
Subject: viewer#3169 Legacy settings should no longer be automatically
 converted

---
 indra/newview/app_settings/settings.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'indra/newview/app_settings')

diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml
index 6d6a52a77f..07298fa921 100644
--- a/indra/newview/app_settings/settings.xml
+++ b/indra/newview/app_settings/settings.xml
@@ -9185,7 +9185,7 @@
     <key>Type</key>
     <string>Boolean</string>
     <key>Value</key>
-    <integer>1</integer>
+    <integer>0</integer>
   </map>
   <key>RenderSkyAutoAdjustAmbientScale</key>
   <map>
-- 
cgit v1.2.3


From ae9174ffdf340ef12c80547d90d05919957ab512 Mon Sep 17 00:00:00 2001
From: Dave Parks <davep@lindenlab.com>
Date: Tue, 10 Dec 2024 13:28:50 -0800
Subject: #3234 Fix for slightly transparent objects negating colors (#3259)

---
 indra/newview/app_settings/shaders/class2/deferred/alphaF.glsl | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'indra/newview/app_settings')

diff --git a/indra/newview/app_settings/shaders/class2/deferred/alphaF.glsl b/indra/newview/app_settings/shaders/class2/deferred/alphaF.glsl
index 02aaf24194..3e702f26be 100644
--- a/indra/newview/app_settings/shaders/class2/deferred/alphaF.glsl
+++ b/indra/newview/app_settings/shaders/class2/deferred/alphaF.glsl
@@ -308,6 +308,7 @@ void main()
     final_scale = 1;
 #endif
 
-    frag_color = max(color * final_scale, vec4(0));
+    color.rgb *= final_scale;
+    frag_color = max(color, vec4(0));
 }
 
-- 
cgit v1.2.3