diff options
| author | Rye Mutt <lightdrake@gmail.com> | 2020-04-01 00:23:57 +0000 |
|---|---|---|
| committer | Dave Houlton <euclid@lindenlab.com> | 2020-04-01 00:23:57 +0000 |
| commit | c77e4e7a57ecfece08d1fddb179ca512539660ba (patch) | |
| tree | 75e30b3e0ab33067156617ebf4992fa8dda0f7ef /indra/newview | |
| parent | 2cd264f4a81439455497c486fe0726769f95ee93 (diff) | |
| parent | 8e436fc3964c6dada4c071cc1390358116291358 (diff) | |
Merged in eep-fix-light-color (pull request #53)
Fix editing light color corrupting intensity and color values
Approved-by: Dave Houlton
Diffstat (limited to 'indra/newview')
| -rw-r--r-- | indra/newview/llpanelvolume.cpp | 2 | ||||
| -rw-r--r-- | 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 ae727e409f..05d9346f89 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 bd7ad399f9..fe9d770f39 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 |