#3170 Fix for tonemapping not working with PBR skies.

1 files changed, 17 insertions, 0 deletions

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;