viewer#3170 Fix tonemaping slider

At the moment slider is in general settings, not per environment

Author: akleshchev

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;

indra/llinventory/llsettingssky.h

@@ -212,7 +212,6 @@ class LLSettingsSky: public LLSettingsBase
     F32 getHDRMin() const;
     F32 getHDRMax() const;
     F32 getHDROffset() const;
-    F32 getTonemapMix() const;
 
     void setGamma(F32 val);
 
@@ -385,7 +384,6 @@ class LLSettingsSky: public LLSettingsBase
     F32 mCloudVariance;
     F32 mCloudShadow;
     F32 mCloudScale;
-    F32 mTonemapMix;
     F32 mHDROffset;
     F32 mHDRMax;
     F32 mHDRMin;

indra/newview/pipeline.cpp

@@ -7152,7 +7152,15 @@ void LLPipeline::tonemap(LLRenderTarget* src, LLRenderTarget* dst)
         shader.uniform1i(tonemap_type, tonemap_type_setting);
 
         static LLCachedControl<F32> tonemap_mix_setting(gSavedSettings, "RenderTonemapMix", 1.f);
-        shader.uniform1f(tonemap_mix, psky->getTonemapMix());
+        if (psky->canAutoAdjust())
+        {
+            // Legacy skies
+            shader.uniform1f(tonemap_mix, 0.f);
+        }
+        else
+        {
+            shader.uniform1f(tonemap_mix, tonemap_mix_setting());
+        }
 
         mScreenTriangleVB->setBuffer();
         mScreenTriangleVB->drawArrays(LLRender::TRIANGLES, 0, 3);