1 files changed, 7 insertions, 63 deletions

diff --git a/indra/newview/llwaterparammanager.cpp b/indra/newview/llwaterparammanager.cpp
index 4b3a9a4dc3..4e56be5851 100644
--- a/indra/newview/llwaterparammanager.cpp
+++ b/indra/newview/llwaterparammanager.cpp
@@ -57,8 +57,6 @@
 
 #include "curl/curl.h"
 
-LLWaterParamManager * LLWaterParamManager::sInstance = NULL;
-
 LLWaterParamManager::LLWaterParamManager() :
 	mFogColor(22.f/255.f, 43.f/255.f, 54.f/255.f, 0.0f, 0.0f, "waterFogColor", "WaterFogColor"),
 	mFogDensity(4, "waterFogDensity", 2),
@@ -72,8 +70,6 @@ LLWaterParamManager::LLWaterParamManager() :
 	mWave1Dir(.5f, .5f, "wave1Dir"),
 	mWave2Dir(.5f, .5f, "wave2Dir"),
 	mDensitySliderValue(1.0f),
-	mPrevFogDensity(16.0f), // 2^4
-	mPrevFogColor(22.f/255.f, 43.f/255.f, 54.f/255.f, 0.0f),
 	mWaterFogKS(1.0f)
 {
 }
@@ -248,7 +244,7 @@ void LLWaterParamManager::updateShaderUniforms(LLGLSLShader * shader)
 {
 	if (shader->mShaderGroup == LLGLSLShader::SG_WATER)
 	{
-		shader->uniform4fv(LLViewerShaderMgr::LIGHTNORM, 1, LLWLParamManager::instance()->getRotatedLightDir().mV);
+		shader->uniform4fv(LLViewerShaderMgr::LIGHTNORM, 1, LLWLParamManager::getInstance()->getRotatedLightDir().mV);
 		shader->uniform3fv("camPosLocal", 1, LLViewerCamera::getInstance()->getOrigin().mV);
 		shader->uniform4fv("waterFogColor", 1, LLDrawPoolWater::sWaterFogColor.mV);
 		shader->uniform4fv("waterPlane", 1, mWaterPlane.mV);
@@ -258,29 +254,15 @@ void LLWaterParamManager::updateShaderUniforms(LLGLSLShader * shader)
 	}
 }
 
-static LLFastTimer::DeclareTimer FTM_UPDATE_WLPARAM("Update Windlight Params");
+static LLFastTimer::DeclareTimer FTM_UPDATE_WATERPARAM("Update Water Params");
 
 void LLWaterParamManager::update(LLViewerCamera * cam)
 {
-	LLFastTimer ftm(FTM_UPDATE_WLPARAM);
+	LLFastTimer ftm(FTM_UPDATE_WATERPARAM);
 	
 	// update the shaders and the menu
 	propagateParameters();
 	
-	// If water fog color has been changed, save it.
-	if (mPrevFogColor != mFogColor)
-	{
-		gSavedSettings.setColor4("WaterFogColor", mFogColor);
-		mPrevFogColor = mFogColor;
-	}
-
-	// If water fog density has been changed, save it.
-	if (mPrevFogDensity != mFogDensity)
-	{
-		gSavedSettings.setF32("WaterFogDensity", mFogDensity);
-		mPrevFogDensity = mFogDensity;
-	}
-	
 	// sync menus if they exist
 	LLFloaterWater* waterfloater = LLFloaterReg::findTypedInstance<LLFloaterWater>("env_water");
 	if(waterfloater) 
@@ -336,19 +318,6 @@ void LLWaterParamManager::update(LLViewerCamera * cam)
 	}
 }
 
-// static
-void LLWaterParamManager::initClass(void)
-{
-	instance();
-}
-
-// static
-void LLWaterParamManager::cleanupClass(void)
-{
-	delete sInstance;
-	sInstance = NULL;
-}
-
 bool LLWaterParamManager::addParamSet(const std::string& name, LLWaterParamSet& param)
 {
 	// add a new one if not one there already
@@ -455,34 +424,9 @@ F32 LLWaterParamManager::getFogDensity(void)
 	return fogDensity;
 }
 
-// static
-LLWaterParamManager * LLWaterParamManager::instance()
-{
-	if(NULL == sInstance)
-	{
-		sInstance = new LLWaterParamManager();
-
-		sInstance->loadAllPresets(LLStringUtil::null);
-
-		sInstance->getParamSet("Default", sInstance->mCurParams);
-		sInstance->initOverrides();
-	}
-
-	return sInstance;
-}
-
-void LLWaterParamManager::initOverrides()
+// virtual static
+void LLWaterParamManager::initSingleton()
 {
-	// Override fog color from the current preset with the saved setting.
-	LLColor4 fog_color_override = gSavedSettings.getColor4("WaterFogColor");
-	mFogColor = fog_color_override;
-	mPrevFogColor = fog_color_override;
-	mCurParams.set("waterFogColor", fog_color_override);
-
-	// Do the same with fog density.
-	F32 fog_density = gSavedSettings.getF32("WaterFogDensity");
-	mPrevFogDensity = fog_density;
-	mFogDensity = fog_density;
-	mCurParams.set("waterFogDensity", fog_density);
-	setDensitySliderValue(mFogDensity.mExp);
+	loadAllPresets(LLStringUtil::null);
+	getParamSet("Default", mCurParams);
 }