From 8e436fc3964c6dada4c071cc1390358116291358 Mon Sep 17 00:00:00 2001
From: Rye Mutt <rye@alchemyviewer.org>
Date: Mon, 30 Mar 2020 10:39:10 -0400
Subject: [PATCH] Fix editing light color corrupting intensity and color values
---
indra/newview/llpanelvolume.cpp | 2 +-
indra/newview/llvovolume.cpp | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/indra/newview/llpanelvolume.cpp b/indra/newview/llpanelvolume.cpp
index ae727e409f3..05d9346f89a 100644
--- a/indra/newview/llpanelvolume.cpp
+++ b/indra/newview/llpanelvolume.cpp
@@ -328,7 +328,7 @@ void LLPanelVolume::getState( )
getChild<LLUICtrl>("Light Focus")->setValue(params.mV[1]);
getChild<LLUICtrl>("Light Ambiance")->setValue(params.mV[2]);
- mLightSavedColor = volobjp->getLightSRGBColor();
+ mLightSavedColor = volobjp->getLightSRGBBaseColor();
}
else
{
diff --git a/indra/newview/llvovolume.cpp b/indra/newview/llvovolume.cpp
index bd7ad399f9d..fe9d770f39e 100644
--- a/indra/newview/llvovolume.cpp
+++ b/indra/newview/llvovolume.cpp
@@ -3228,7 +3228,7 @@ BOOL LLVOVolume::getIsLight() const
LLColor3 LLVOVolume::getLightSRGBBaseColor() const
{
- return srgbColor3(getLightLinearColor());
+ return srgbColor3(getLightLinearBaseColor());
}
LLColor3 LLVOVolume::getLightLinearBaseColor() const
--
GitLab