summaryrefslogtreecommitdiff
path: root/indra/newview/llpanelobject.cpp
diff options
context:
space:
mode:
authorAndrey Lihatskiy <alihatskiy@productengine.com>2020-04-26 21:15:54 +0300
committerAndrey Lihatskiy <alihatskiy@productengine.com>2020-04-26 21:15:54 +0300
commitf4c7c8aff55d0cd8f044d5b7c8cddb2be750dde5 (patch)
tree8c02c1a468a85367c3b7e43e4e95ffb5f1dca452 /indra/newview/llpanelobject.cpp
parent231dea378babc0ee9806f0fcd68283e79f81d2eb (diff)
Post-merge build fixes
Diffstat (limited to 'indra/newview/llpanelobject.cpp')
-rw-r--r--indra/newview/llpanelobject.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/llpanelobject.cpp b/indra/newview/llpanelobject.cpp
index 8c5afb914a..ac0122237f 100644
--- a/indra/newview/llpanelobject.cpp
+++ b/indra/newview/llpanelobject.cpp
@@ -2215,7 +2215,7 @@ void LLPanelObject::onCopyParams()
mParamsClipboard["light"]["intensity"] = volobjp->getLightIntensity();
mParamsClipboard["light"]["radius"] = volobjp->getLightRadius();
mParamsClipboard["light"]["falloff"] = volobjp->getLightFalloff();
- LLColor3 color = volobjp->getLightColor();
+ LLColor3 color = volobjp->getLightSRGBColor();
mParamsClipboard["light"]["r"] = color.mV[0];
mParamsClipboard["light"]["g"] = color.mV[1];
mParamsClipboard["light"]["b"] = color.mV[2];
@@ -2288,7 +2288,7 @@ void LLPanelObject::onPasteParams()
F32 r = (F32)mParamsClipboard["light"]["r"].asReal();
F32 g = (F32)mParamsClipboard["light"]["g"].asReal();
F32 b = (F32)mParamsClipboard["light"]["b"].asReal();
- volobjp->setLightColor(LLColor3(r,g,b));
+ volobjp->setLightSRGBColor(LLColor3(r, g, b));
}
else
{