diff options
| author | Vir Linden <vir@lindenlab.com> | 2021-11-09 21:39:47 +0000 |
|---|---|---|
| committer | Vir Linden <vir@lindenlab.com> | 2021-11-09 21:39:47 +0000 |
| commit | 4d0010d1fcb22ce0672d2667d73f5a612c600e14 (patch) | |
| tree | 66e2029a1eb2d82c2c21a39e9772c42319f7a155 /indra/llinventory | |
| parent | ca0b9a3753fa3b42d4ac8183adcf30d957f55016 (diff) | |
| parent | 768b7a4d33b64dc3e9d7f7c0c384bb2aa37b458b (diff) | |
Merged DRTVWR-546 into SL-16329
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; |