From ef15c3c7ce4927a9e3756eef64700459c7a28ab5 Mon Sep 17 00:00:00 2001
From: Hecklezz <tj8@live.com.au>
Date: Sun, 27 Apr 2025 20:00:59 +1000
Subject: [PATCH] Remove RenderSkyAutoAdjustLegacy and RenderSkyAmbientScale
 from graphic preset controls, and set their correct defaults on preset load.

---
 indra/newview/app_settings/graphic_preset_controls.xml | 2 --
 indra/newview/llpresetsmanager.cpp                     | 5 +++++
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/indra/newview/app_settings/graphic_preset_controls.xml b/indra/newview/app_settings/graphic_preset_controls.xml
index fff393b124..1402dda73b 100644
--- a/indra/newview/app_settings/graphic_preset_controls.xml
+++ b/indra/newview/app_settings/graphic_preset_controls.xml
@@ -74,13 +74,11 @@
 		<string>RenderShaderLightingMaxLevel</string>
 		<string>RenderShadowDetail</string>
 		<string>RenderShadowResolutionScale</string>
-		<string>RenderSkyAmbientScale</string>
 		<string>RenderSkyAutoAdjustAmbientScale</string>
 		<string>RenderSkyAutoAdjustBlueDensityScale</string>
 		<string>RenderSkyAutoAdjustBlueHorizonScale</string>
 		<string>RenderSkyAutoAdjustSunColorScale</string>
 		<string>RenderSkyAutoAdjustHDRScale</string>
-		<string>RenderSkyAutoAdjustLegacy</string>
 		<string>RenderSkyAutoAdjustProbeAmbiance</string>
 		<string>RenderSkySunlightScale</string>
 		<string>RenderSSAOIrradianceScale</string>
diff --git a/indra/newview/llpresetsmanager.cpp b/indra/newview/llpresetsmanager.cpp
index d4da3bfbe5..836869a665 100644
--- a/indra/newview/llpresetsmanager.cpp
+++ b/indra/newview/llpresetsmanager.cpp
@@ -538,6 +538,11 @@ void LLPresetsManager::loadPreset(const std::string& subdirectory, std::string n
         {
             gSavedSettings.setString("PresetGraphicActive", name);
 
+            // <FS> [FIRE-35390] Old viewer presets have these as true and 0.7, whereas the equivalent on modern viewers is false and 1.0
+            gSavedSettings.setBOOL("RenderSkyAutoAdjustLegacy", false);
+            gSavedSettings.setF32("RenderSkyAmbientScale", 1.0);
+            // </FS>
+
             // <FS:Ansariel> Update indirect controls
             LLAvatarComplexityControls::setIndirectControls();