Merge remote-tracking branch 'secondlife/release/2024.09-ExtraFPS' into 2024.09-ExtraFPS

2 files changed, 47 insertions, 1 deletions

diff --git a/indra/llinventory/llsettingssky.cpp b/indra/llinventory/llsettingssky.cpp
index 03beebd9e1..a9b83657b7 100644
--- a/indra/llinventory/llsettingssky.cpp
+++ b/indra/llinventory/llsettingssky.cpp
@@ -602,7 +602,7 @@ void LLSettingsSky::blend(LLSettingsBase::ptr_t &end, F64 blendf)
 
         mSettingFlags |= other->mSettingFlags;
 
-        mCanAutoAdjust = false; // no point?
+        mCanAutoAdjust = other->mCanAutoAdjust;
 
         mSunRotation = slerp((F32)blendf, mSunRotation, other->mSunRotation);
         mMoonRotation = slerp((F32)blendf, mMoonRotation, other->mMoonRotation);
@@ -1178,6 +1178,11 @@ void LLSettingsSky::loadValuesFromLLSD()
         mReflectionProbeAmbiance = (F32)settings[SETTING_REFLECTION_PROBE_AMBIANCE].asReal();
     }
 
+    mHDRMax = 2.0f;
+    mHDRMin = 0.5f;
+    mHDROffset = 1.0f;
+    mTonemapMix = 1.0f;
+
     mSunTextureId = settings[SETTING_SUN_TEXTUREID].asUUID();
     mMoonTextureId = settings[SETTING_MOON_TEXTUREID].asUUID();
     mCloudTextureId = settings[SETTING_CLOUD_TEXTUREID].asUUID();
@@ -2028,6 +2033,38 @@ F32 LLSettingsSky::getGamma() const
     return mGamma;
 }
 
+F32 LLSettingsSky::getHDRMin() const
+{
+    if (mCanAutoAdjust)
+        return 0.f;
+
+    return mHDRMin;
+}
+
+F32 LLSettingsSky::getHDRMax() const
+{
+    if (mCanAutoAdjust)
+        return 0.f;
+
+    return mHDRMax;
+}
+
+F32 LLSettingsSky::getHDROffset() const
+{
+    if (mCanAutoAdjust)
+        return 1.0f;
+
+    return mHDROffset;
+}
+
+F32 LLSettingsSky::getTonemapMix() const
+{
+    if (mCanAutoAdjust)
+        return 0.0f;
+
+    return mTonemapMix;
+}
+
 void LLSettingsSky::setGamma(F32 val)
 {
     mGamma = val;
diff --git a/indra/llinventory/llsettingssky.h b/indra/llinventory/llsettingssky.h
index 38c0368423..8d73c35ff3 100644
--- a/indra/llinventory/llsettingssky.h
+++ b/indra/llinventory/llsettingssky.h
@@ -209,6 +209,11 @@ public:
 
     F32 getGamma() const;
 
+    F32 getHDRMin() const;
+    F32 getHDRMax() const;
+    F32 getHDROffset() const;
+    F32 getTonemapMix() const;
+
     void setGamma(F32 val);
 
     LLColor3 getGlow() const;
@@ -380,6 +385,10 @@ protected:
     F32 mCloudVariance;
     F32 mCloudShadow;
     F32 mCloudScale;
+    F32 mTonemapMix;
+    F32 mHDROffset;
+    F32 mHDRMax;
+    F32 mHDRMin;
     LLVector2 mScrollRate;
     LLColor3 mCloudPosDensity1;
     LLColor3 mCloudPosDensity2;