livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #114 from Hecklezz/fix/default_RenderSkyAutoAdjustLegacy_on_preset_load 

[FIRE-35390] Fix loading old presets with RenderSkyAutoAdjustLegacy and RenderSkyAmbientScale causing graphical inconsistency
meow-7.2.2
Beq Janus 2025-05-02 02:01:18 +01:00 committed by GitHub
parent 20fab011a5 ef15c3c7ce
commit ece405b0f3
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
indra/newview/app_settings/graphic_preset_controls.xml
View File

@ -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>

5
indra/newview/llpresetsmanager.cpp
View File

@ -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();