diff options
| author | Michael Pohoreski <ptolemy@lindenlab.com> | 2021-11-01 16:30:01 +0000 |
|---|---|---|
| committer | Michael Pohoreski <ptolemy@lindenlab.com> | 2021-11-01 16:30:01 +0000 |
| commit | 2369af6999e65d523ff4db06e7d5fda792153bee (patch) | |
| tree | a4bd2bdddb24ae0b443878b0337e77787d3fea40 /indra/llinventory | |
| parent | 68b75be652575ff301172b7b19522d4f0494bdf0 (diff) | |
| parent | 1be8a8d10bd3542b0b5c2943a508509c5cfcf3ef (diff) | |
Merged in SL-16127_More_tweaks (pull request #752)
SL-16127 More tweaks
Approved-by: Euclid Linden
Approved-by: Dave Parks
Diffstat (limited to 'indra/llinventory')
| -rw-r--r-- | indra/llinventory/llsettingssky.cpp | 4 | ||||
| -rw-r--r-- | indra/llinventory/llsettingssky.h | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/indra/llinventory/llsettingssky.cpp b/indra/llinventory/llsettingssky.cpp index 23f9c8e9d7..0ada97ad3f 100644 --- a/indra/llinventory/llsettingssky.cpp +++ b/indra/llinventory/llsettingssky.cpp @@ -1214,9 +1214,9 @@ LLColor3 LLSettingsSky::getLightTransmittanceFast( const LLColor3& total_density // performs soft scale clip and gamma correction ala the shader implementation // scales colors down to 0 - 1 range preserving relative ratios -LLColor3 LLSettingsSky::gammaCorrect(const LLColor3& in) const +LLColor3 LLSettingsSky::gammaCorrect(const LLColor3& in,const F32 &gamma) const { - F32 gamma = getGamma(); + //F32 gamma = getGamma(); // SL-16127: Use cached gamma from atmospheric vars LLColor3 v(in); // scale down to 0 to 1 range preserving relative ratio (aka homegenize) diff --git a/indra/llinventory/llsettingssky.h b/indra/llinventory/llsettingssky.h index 77d9d8e87c..fa9326f006 100644 --- a/indra/llinventory/llsettingssky.h +++ b/indra/llinventory/llsettingssky.h @@ -254,7 +254,7 @@ public: LLColor3 getLightTransmittance(F32 distance) const; LLColor3 getLightTransmittanceFast(const LLColor3& total_density, const F32 density_multiplier, const F32 distance) const; LLColor3 getTotalDensity() const; - LLColor3 gammaCorrect(const LLColor3& in) const; + LLColor3 gammaCorrect(const LLColor3& in,const F32 &gamma) const; LLColor3 getBlueDensity() const; LLColor3 getBlueHorizon() const; |