diff options
| author | Andrey Kleshchev <andreykproductengine@lindenlab.com> | 2024-11-28 20:19:51 +0200 |
|---|---|---|
| committer | Andrey Kleshchev <117672381+akleshchev@users.noreply.github.com> | 2024-11-29 00:12:27 +0200 |
| commit | 1b4814f0e5784b3c339328cccde070dc7c20606b (patch) | |
| tree | f12421c456e534d5fe0f9b69db474228b251f8f8 /indra/llinventory | |
| parent | 16cc5fc35bc78aeb3043384d46d8a3d9ef580c18 (diff) | |
viewer#3170 Fix tonemaping slider
At the moment slider is in general settings, not per environment
Diffstat (limited to 'indra/llinventory')
| -rw-r--r-- | indra/llinventory/llsettingssky.cpp | 9 | ||||
| -rw-r--r-- | indra/llinventory/llsettingssky.h | 2 |
2 files changed, 0 insertions, 11 deletions
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; diff --git a/indra/llinventory/llsettingssky.h b/indra/llinventory/llsettingssky.h index 8d73c35ff3..f61f8af116 100644 --- a/indra/llinventory/llsettingssky.h +++ b/indra/llinventory/llsettingssky.h @@ -212,7 +212,6 @@ public: F32 getHDRMin() const; F32 getHDRMax() const; F32 getHDROffset() const; - F32 getTonemapMix() const; void setGamma(F32 val); @@ -385,7 +384,6 @@ protected: F32 mCloudVariance; F32 mCloudShadow; F32 mCloudScale; - F32 mTonemapMix; F32 mHDROffset; F32 mHDRMax; F32 mHDRMin; |