From 096ea05a936d178ce0533708edab27708e9e718f Mon Sep 17 00:00:00 2001
From: "Graham Linden graham@lindenlab.com"
 <Graham Linden graham@lindenlab.com>
Date: Thu, 8 Mar 2018 00:04:03 +0000
Subject: Rename getFogColor from water and sky settings to getWaterFogColor
 and getSkyFogColor.

---
 indra/newview/llfloatereditwater.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'indra/newview/llfloatereditwater.cpp')

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();
-- 
cgit v1.2.3