Rename getFogColor from water and sky settings to getWaterFogColor and getSkyFogColor.

11 files changed, 18 insertions, 18 deletions

diff --git a/indra/newview/lldrawpoolwater.cpp b/indra/newview/lldrawpoolwater.cpp
index 567172e647..5c92cf9fce 100644
--- a/indra/newview/lldrawpoolwater.cpp
+++ b/indra/newview/lldrawpoolwater.cpp
@@ -609,8 +609,8 @@ void LLDrawPoolWater::shade()
 		
 	if (screentex > -1)
 	{
-		shader->uniform3fv(LLShaderMgr::WATER_FOGCOLOR, 1, pwater->getFogColor().mV);
-        shader->uniform1f(LLShaderMgr::WATER_FOGDENSITY, pwater->getFogDensity());
+		shader->uniform3fv(LLShaderMgr::WATER_FOGCOLOR, 1, pwater->getWaterFogColor().mV);
+        shader->uniform1f(LLShaderMgr::WATER_FOGDENSITY, pwater->getWaterFogDensity());
 		gPipeline.mWaterDis.bindTexture(0, screentex);
 	}
 	
@@ -620,8 +620,8 @@ void LLDrawPoolWater::shade()
 
 	if (mVertexShaderLevel == 1)
 	{
-        LLColor4 fog_color(pwater->getFogColor(), 0.f);
-        fog_color[3] = pwater->getFogDensity();
+        LLColor4 fog_color(pwater->getWaterFogColor(), 0.f);
+        fog_color[3] = pwater->getWaterFogDensity();
         shader->uniform4fv(LLShaderMgr::WATER_FOGCOLOR, 1, fog_color.mV);
 	}
 
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();
diff --git a/indra/newview/lllegacyatmospherics.cpp b/indra/newview/lllegacyatmospherics.cpp
index 622f75a88b..6bc95c367c 100644
--- a/indra/newview/lllegacyatmospherics.cpp
+++ b/indra/newview/lllegacyatmospherics.cpp
@@ -553,8 +553,8 @@ void LLAtmospherics::updateFog(const F32 distance, LLVector3& tosun)
 		F32 depth = water_height - camera_height;
 		
 		// get the water param manager variables
-        float water_fog_density = pwater->getFogDensity();
-		LLColor4 water_fog_color(pwater->getFogColor());
+        float water_fog_density = pwater->getWaterFogDensity();
+		LLColor4 water_fog_color(pwater->getWaterFogColor());
 		
 		// adjust the color based on depth.  We're doing linear approximations
 		float depth_scale = gSavedSettings.getF32("WaterGLFogDepthScale");
diff --git a/indra/newview/llsky.cpp b/indra/newview/llsky.cpp
index fb3123fd81..15aebda5ad 100644
--- a/indra/newview/llsky.cpp
+++ b/indra/newview/llsky.cpp
@@ -377,11 +377,11 @@ void LLSky::setSunPhase(const F32 phase)
 //////////////////////////////////////////////////////////////////////
 
 
-LLColor4 LLSky::getFogColor() const
+LLColor4 LLSky::getSkyFogColor() const
 {
 	if (mVOSkyp)
 	{
-		return mVOSkyp->getFogColor();
+		return mVOSkyp->getSkyFogColor();
 	}
 
 	return LLColor4(1.f, 1.f, 1.f, 1.f);
diff --git a/indra/newview/llsky.h b/indra/newview/llsky.h
index 79549948f6..010cc30d55 100644
--- a/indra/newview/llsky.h
+++ b/indra/newview/llsky.h
@@ -54,7 +54,7 @@ public:
 
 	void setSunDirection(const LLVector3 &sun_direction, const LLVector3 &moon_direction);
 
-	LLColor4 getFogColor() const;
+	LLColor4 getSkyFogColor() const;
 
 	void setCloudDensityAtAgent(F32 cloud_density);
 	void setWind(const LLVector3& wind);
diff --git a/indra/newview/lltracker.cpp b/indra/newview/lltracker.cpp
index 2ec5c41b88..728d0c9417 100644
--- a/indra/newview/lltracker.cpp
+++ b/indra/newview/lltracker.cpp
@@ -570,8 +570,8 @@ void LLTracker::renderBeacon(LLVector3d pos_global,
 		color_frac = 1.f - 0.6f*(dist/LLViewerCamera::getInstance()->getFar());
 	}
 
-	LLColor4 fogged_color = color_frac * color + (1 - color_frac)*gSky.getFogColor();
-	LLColor4 fogged_color_under = color_frac * color_under + (1 - color_frac) * gSky.getFogColor();
+	LLColor4 fogged_color = color_frac * color + (1 - color_frac)*gSky.getSkyFogColor();
+	LLColor4 fogged_color_under = color_frac * color_under + (1 - color_frac) * gSky.getSkyFogColor();
 
 	F32 FADE_DIST = 3.f;
 	fogged_color.mV[3] = llmax(0.2f, llmin(0.5f,(dist-FADE_DIST)/FADE_DIST));
diff --git a/indra/newview/llviewerdisplay.cpp b/indra/newview/llviewerdisplay.cpp
index 46a8d75595..950243949f 100644
--- a/indra/newview/llviewerdisplay.cpp
+++ b/indra/newview/llviewerdisplay.cpp
@@ -920,7 +920,7 @@ void display(BOOL rebuild, F32 zoom_factor, int subfield, BOOL for_snapshot)
 				gPipeline.mScreen.bindTarget();
 				if (LLPipeline::sUnderWaterRender && !gPipeline.canUseWindLightShaders())
 				{
-					const LLColor4 &col = LLEnvironment::instance().getCurrentWater()->getFogColor();
+					const LLColor4 &col = LLEnvironment::instance().getCurrentWater()->getWaterFogColor();
 					glClearColor(col.mV[0], col.mV[1], col.mV[2], 0.f);
 				}
 				gPipeline.mScreen.clear();
diff --git a/indra/newview/llvoground.cpp b/indra/newview/llvoground.cpp
index 71a7623fb4..52a6395618 100644
--- a/indra/newview/llvoground.cpp
+++ b/indra/newview/llvoground.cpp
@@ -126,7 +126,7 @@ BOOL LLVOGround::updateGeometry(LLDrawable *drawable)
 	left_dir.normVec();
 
 	// Our center top point
-	LLColor4 ground_color = gSky.getFogColor();
+	LLColor4 ground_color = gSky.getSkyFogColor();
 	ground_color.mV[3] = 1.f;
 	face->setFaceColor(ground_color);
 	
diff --git a/indra/newview/llvosky.cpp b/indra/newview/llvosky.cpp
index d295efaa66..55307fe1dc 100644
--- a/indra/newview/llvosky.cpp
+++ b/indra/newview/llvosky.cpp
@@ -1254,7 +1254,7 @@ void LLVOSky::updateReflectionGeometry(LLDrawable *drawable, F32 H,
         const F32 attenuation = min_attenuation
             + cos_angle_of_view * (max_attenuation - min_attenuation);
 
-        LLColor4 hb_refl_col = (1 - attenuation) * hb_col + attenuation * getFogColor();
+        LLColor4 hb_refl_col = (1 - attenuation) * hb_col + attenuation * getSkyFogColor();
         face->setFaceColor(hb_refl_col);
 
         LLVector3 v_far[2];
diff --git a/indra/newview/llvosky.h b/indra/newview/llvosky.h
index f8a6827a2b..e93ff51a66 100644
--- a/indra/newview/llvosky.h
+++ b/indra/newview/llvosky.h
@@ -307,7 +307,7 @@ public:
     void setFogRatio(const F32 fog_ratio)               { m_legacyAtmospherics.setFogRatio(fog_ratio); }
     F32  getFogRatio() const                            { return m_legacyAtmospherics.getFogRatio(); }
 
-    LLColor4 getFogColor() const                        { return m_legacyAtmospherics.getFogColor(); }
+    LLColor4 getSkyFogColor() const                        { return m_legacyAtmospherics.getFogColor(); }
     LLColor4 getGLFogColor() const                      { return m_legacyAtmospherics.getGLFogColor(); }
 
     LLColor4U getFadeColor() const;
diff --git a/indra/newview/pipeline.cpp b/indra/newview/pipeline.cpp
index 8f691a0453..4f34f58b76 100644
--- a/indra/newview/pipeline.cpp
+++ b/indra/newview/pipeline.cpp
@@ -10043,7 +10043,7 @@ void LLPipeline::generateWaterReflection(LLCamera& camera_in)
 
 			gGL.getTexUnit(0)->unbind(LLTexUnit::TT_TEXTURE);
 			
-			LLColor3 col = LLEnvironment::instance().getCurrentWater()->getFogColor();
+			LLColor3 col = LLEnvironment::instance().getCurrentWater()->getWaterFogColor();
 			glClearColor(col.mV[0], col.mV[1], col.mV[2], 0.f);
 			mWaterDis.bindTarget();
 			LLViewerCamera::sCurCameraID = LLViewerCamera::CAMERA_WATER1;