diff options
| author | Dave Parks <davep@lindenlab.com> | 2020-03-27 22:33:57 +0000 |
|---|---|---|
| committer | Dave Parks <davep@lindenlab.com> | 2020-03-27 22:33:57 +0000 |
| commit | c28852bd9aef0d3f69dd1fb76b8208666af68613 (patch) | |
| tree | 6b3baf227dbd5b998309f48f983bc15c5a66253b /indra/llprimitive/llprimitive.cpp | |
| parent | f61474fe5b3bd616fdd2d92fbb3478891bb60fb1 (diff) | |
| parent | e468d8018634b51f329eae17485c3358c0a3630b (diff) | |
Merged in davep/DRTVWR-440 (pull request #52)
SL-12902 Better fix for light color values in color swatch not matching light color values inworld.
Diffstat (limited to 'indra/llprimitive/llprimitive.cpp')
| -rw-r--r-- | indra/llprimitive/llprimitive.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/indra/llprimitive/llprimitive.cpp b/indra/llprimitive/llprimitive.cpp index bc5dd62f45..53b83a40d7 100644 --- a/indra/llprimitive/llprimitive.cpp +++ b/indra/llprimitive/llprimitive.cpp @@ -1659,7 +1659,7 @@ BOOL LLLightParams::unpack(LLDataPacker &dp) { LLColor4U color; dp.unpackColor4U(color, "color"); - setColor(LLColor4(color)); + setLinearColor(LLColor4(color)); F32 radius; dp.unpackF32(radius, "radius"); @@ -1707,7 +1707,7 @@ LLSD LLLightParams::asLLSD() const { LLSD sd; - sd["color"] = ll_sd_from_color4(getColor()); + sd["color"] = ll_sd_from_color4(getLinearColor()); sd["radius"] = getRadius(); sd["falloff"] = getFalloff(); sd["cutoff"] = getCutoff(); @@ -1721,7 +1721,7 @@ bool LLLightParams::fromLLSD(LLSD& sd) w = "color"; if (sd.has(w)) { - setColor( ll_color4_from_sd(sd["color"]) ); + setLinearColor( ll_color4_from_sd(sd["color"]) ); } else goto fail; w = "radius"; if (sd.has(w)) |