summaryrefslogtreecommitdiff
path: root/indra/newview
diff options
context:
space:
mode:
Diffstat (limited to 'indra/newview')
-rw-r--r--indra/newview/llpanelvolume.cpp2
-rw-r--r--indra/newview/llvovolume.cpp2
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