From 1b4814f0e5784b3c339328cccde070dc7c20606b Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Thu, 28 Nov 2024 20:19:51 +0200
Subject: viewer#3170 Fix tonemaping slider

At the moment slider is in general settings, not per environment
---
 indra/llinventory/llsettingssky.cpp | 9 ---------
 1 file changed, 9 deletions(-)

(limited to 'indra/llinventory/llsettingssky.cpp')

diff --git a/indra/llinventory/llsettingssky.cpp b/indra/llinventory/llsettingssky.cpp
index f773b64bde..17d259a163 100644
--- a/indra/llinventory/llsettingssky.cpp
+++ b/indra/llinventory/llsettingssky.cpp
@@ -1180,7 +1180,6 @@ void LLSettingsSky::loadValuesFromLLSD()
     mHDRMax = 2.0f;
     mHDRMin = 0.5f;
     mHDROffset = 1.0f;
-    mTonemapMix = 1.0f;
 
     mSunTextureId = settings[SETTING_SUN_TEXTUREID].asUUID();
     mMoonTextureId = settings[SETTING_MOON_TEXTUREID].asUUID();
@@ -2056,14 +2055,6 @@ F32 LLSettingsSky::getHDROffset() const
     return mHDROffset;
 }
 
-F32 LLSettingsSky::getTonemapMix() const
-{
-    if (mCanAutoAdjust)
-        return 0.0f;
-
-    return mTonemapMix;
-}
-
 void LLSettingsSky::setGamma(F32 val)
 {
     mGamma = val;
-- 
cgit v1.2.3


From c02baded8464781fcb208676610727e677ac6907 Mon Sep 17 00:00:00 2001
From: "Jonathan \"Geenz\" Goodman" <geenz@lindenlab.com>
Date: Thu, 28 Nov 2024 17:57:30 -0500
Subject: #3170 Fix for tonemapping not working with PBR skies.

---
 indra/llinventory/llsettingssky.cpp | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

(limited to 'indra/llinventory/llsettingssky.cpp')

diff --git a/indra/llinventory/llsettingssky.cpp b/indra/llinventory/llsettingssky.cpp
index 17d259a163..50b458de14 100644
--- a/indra/llinventory/llsettingssky.cpp
+++ b/indra/llinventory/llsettingssky.cpp
@@ -1180,6 +1180,7 @@ void LLSettingsSky::loadValuesFromLLSD()
     mHDRMax = 2.0f;
     mHDRMin = 0.5f;
     mHDROffset = 1.0f;
+    mTonemapMix = 1.0f;
 
     mSunTextureId = settings[SETTING_SUN_TEXTUREID].asUUID();
     mMoonTextureId = settings[SETTING_MOON_TEXTUREID].asUUID();
@@ -2055,6 +2056,22 @@ F32 LLSettingsSky::getHDROffset() const
     return mHDROffset;
 }
 
+F32 LLSettingsSky::getTonemapMix() const
+{
+    if (mCanAutoAdjust)
+        return 0.0f;
+
+    return mTonemapMix;
+}
+
+void LLSettingsSky::setTonemapMix(F32 mix)
+{
+    if (mCanAutoAdjust)
+        return;
+
+    mTonemapMix = mix;
+}
+
 void LLSettingsSky::setGamma(F32 val)
 {
     mGamma = val;
-- 
cgit v1.2.3