From 81676d4753a1abe347a69a95f234a005aad0659f Mon Sep 17 00:00:00 2001
From: Oz Linden <oz@lindenlab.com>
Date: Mon, 18 Apr 2011 15:58:03 -0400
Subject: storm-160: revert latest fixes to prevent conflicts with windlight

---
 indra/newview/app_settings/settings.xml | 27 ---------------------------
 indra/newview/llwaterparammanager.cpp   | 33 ---------------------------------
 indra/newview/llwaterparammanager.h     |  6 ------
 3 files changed, 66 deletions(-)

diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml
index d98f0da1c2..d412b82e95 100644
--- a/indra/newview/app_settings/settings.xml
+++ b/indra/newview/app_settings/settings.xml
@@ -11926,33 +11926,6 @@
       <key>Value</key>
       <integer>0</integer>
     </map>
-    <key>WaterFogColor</key>
-    <map>
-      <key>Comment</key>
-      <string>Water fog color</string>
-      <key>Persist</key>
-      <integer>1</integer>
-      <key>Type</key>
-      <string>Color4</string>
-      <key>Value</key>
-      <array>
-        <real>0.0863</real>
-        <real>0.168</real>
-        <real>0.212</real>
-        <real>0</real>
-      </array>
-    </map>
-    <key>WaterFogDensity</key>
-    <map>
-      <key>Comment</key>
-      <string>Water fog density</string>
-      <key>Persist</key>
-      <integer>1</integer>
-      <key>Type</key>
-      <string>F32</string>
-      <key>Value</key>
-      <real>16.0</real>
-    </map>
     <key>WaterGLFogDensityScale</key>
     <map>
       <key>Comment</key>
diff --git a/indra/newview/llwaterparammanager.cpp b/indra/newview/llwaterparammanager.cpp
index 4b3a9a4dc3..d239347810 100644
--- a/indra/newview/llwaterparammanager.cpp
+++ b/indra/newview/llwaterparammanager.cpp
@@ -72,8 +72,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)
 {
 }
@@ -267,20 +265,6 @@ void LLWaterParamManager::update(LLViewerCamera * cam)
 	// 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) 
@@ -465,24 +449,7 @@ LLWaterParamManager * LLWaterParamManager::instance()
 		sInstance->loadAllPresets(LLStringUtil::null);
 
 		sInstance->getParamSet("Default", sInstance->mCurParams);
-		sInstance->initOverrides();
 	}
 
 	return sInstance;
 }
-
-void LLWaterParamManager::initOverrides()
-{
-	// 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);
-}
diff --git a/indra/newview/llwaterparammanager.h b/indra/newview/llwaterparammanager.h
index f465034c39..c479f1861c 100644
--- a/indra/newview/llwaterparammanager.h
+++ b/indra/newview/llwaterparammanager.h
@@ -284,9 +284,6 @@ public:
 	// singleton pattern implementation
 	static LLWaterParamManager * instance();
 
-private:
-	void initOverrides();
-	
 public:
 
 	LLWaterParamSet mCurParams;
@@ -317,9 +314,6 @@ private:
 	LLVector4 mWaterPlane;
 	F32 mWaterFogKS;
 
-	LLColor4 mPrevFogColor;
-	F32      mPrevFogDensity;
-
 	// our parameter manager singleton instance
 	static LLWaterParamManager * sInstance;
 };
-- 
cgit v1.2.3