summaryrefslogtreecommitdiff
path: root/indra/newview/llfloatereditwater.cpp
diff options
context:
space:
mode:
authorGraham Linden graham@lindenlab.com <Graham Linden graham@lindenlab.com>2018-03-08 00:04:03 +0000
committerGraham Linden graham@lindenlab.com <Graham Linden graham@lindenlab.com>2018-03-08 00:04:03 +0000
commit096ea05a936d178ce0533708edab27708e9e718f (patch)
tree8628a1a58341f1bfd84715d11a1cf31c6395accf /indra/newview/llfloatereditwater.cpp
parent6d77503542216ece1eecf82dce19ebd8d6be7327 (diff)
Rename getFogColor from water and sky settings to getWaterFogColor and getSkyFogColor.
Diffstat (limited to 'indra/newview/llfloatereditwater.cpp')
-rw-r--r--indra/newview/llfloatereditwater.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/llfloatereditwater.cpp b/indra/newview/llfloatereditwater.cpp
index 4d8ffdef21..6e7b777e70 100644
--- a/indra/newview/llfloatereditwater.cpp
+++ b/indra/newview/llfloatereditwater.cpp
@@ -184,10 +184,10 @@ void LLFloaterEditWater::syncControls()
mWaterPresetCombo->setValue(name);
//getChild<LLUICtrl>("WaterGlow")->setValue(col.mV[3]);
- getChild<LLColorSwatchCtrl>("WaterFogColor")->set(LLColor4(pwater->getFogColor()));
+ getChild<LLColorSwatchCtrl>("WaterFogColor")->set(LLColor4(pwater->getWaterFogColor()));
// fog and wavelets
- mWaterAdapter->mFogDensity = pwater->getFogDensity();
+ mWaterAdapter->mFogDensity = pwater->getWaterFogDensity();
getChild<LLUICtrl>("WaterFogDensity")->setValue(mWaterAdapter->mFogDensity.getExp());
mWaterAdapter->mUnderWaterFogMod = pwater->getFogMod();