diff options
| author | Runitai Linden <davep@lindenlab.com> | 2020-03-26 16:48:33 -0500 |
|---|---|---|
| committer | Runitai Linden <davep@lindenlab.com> | 2020-03-26 16:48:33 -0500 |
| commit | d756e185730f46fd78e88215e0b4b9fd282fd1d7 (patch) | |
| tree | ec1fc367436fd8ad904d0344a77bc753086aaa37 /indra/newview/llvovolume.cpp | |
| parent | 9e0cf3edaab99cc1c427e590c179d6dd604f4567 (diff) | |
SL-12902 Fix for doing the technically correct but compatibility wrong thing WRT light color values.
Diffstat (limited to 'indra/newview/llvovolume.cpp')
| -rw-r--r-- | indra/newview/llvovolume.cpp | 14 |
1 files changed, 4 insertions, 10 deletions
diff --git a/indra/newview/llvovolume.cpp b/indra/newview/llvovolume.cpp index c1dd356586..586d3b66b0 100644 --- a/indra/newview/llvovolume.cpp +++ b/indra/newview/llvovolume.cpp @@ -3234,17 +3234,11 @@ LLColor3 LLVOVolume::getLightBaseColor() const } } -LLColor3 LLVOVolume::getLightColor() const +LLColor3 LLVOVolume::getLightLinearColor() const { - const LLLightParams *param_block = (const LLLightParams *)getParameterEntry(LLNetworkData::PARAMS_LIGHT); - if (param_block) - { - return LLColor3(param_block->getColor()) * param_block->getColor().mV[3]; - } - else - { - return LLColor3(1,1,1); - } + LLColor3 ret = getLightSRGBColor(); + ret = linearColor3(ret); + return ret; } LLColor3 LLVOVolume::getLightSRGBColor() const |