diff options
| author | Erik Kundiman <erik@megapahit.org> | 2024-12-01 18:56:45 +0800 |
|---|---|---|
| committer | Erik Kundiman <erik@megapahit.org> | 2024-12-01 18:56:45 +0800 |
| commit | fda6acb4be1145ac1dc6c33859d8a65dcfa8aecb (patch) | |
| tree | 3eefe5eaa1415dc32b78d3125754801400dd7212 /indra/llinventory | |
| parent | 99337674245aca9b01a4346b7f6bd5822c119168 (diff) | |
| parent | c02baded8464781fcb208676610727e677ac6907 (diff) | |
Merge remote-tracking branch 'secondlife/release/2024.09-ExtraFPS' into 2024.09-ExtraFPS
Diffstat (limited to 'indra/llinventory')
| -rw-r--r-- | indra/llinventory/llsettingssky.cpp | 8 | ||||
| -rw-r--r-- | indra/llinventory/llsettingssky.h | 1 |
2 files changed, 9 insertions, 0 deletions
diff --git a/indra/llinventory/llsettingssky.cpp b/indra/llinventory/llsettingssky.cpp index a9b83657b7..45396ce9c7 100644 --- a/indra/llinventory/llsettingssky.cpp +++ b/indra/llinventory/llsettingssky.cpp @@ -2065,6 +2065,14 @@ F32 LLSettingsSky::getTonemapMix() const return mTonemapMix; } +void LLSettingsSky::setTonemapMix(F32 mix) +{ + if (mCanAutoAdjust) + return; + + mTonemapMix = mix; +} + void LLSettingsSky::setGamma(F32 val) { mGamma = val; diff --git a/indra/llinventory/llsettingssky.h b/indra/llinventory/llsettingssky.h index 8d73c35ff3..4c635fd946 100644 --- a/indra/llinventory/llsettingssky.h +++ b/indra/llinventory/llsettingssky.h @@ -213,6 +213,7 @@ public: F32 getHDRMax() const; F32 getHDROffset() const; F32 getTonemapMix() const; + void setTonemapMix(F32 mix); void setGamma(F32 val); |