From 74787fda486a68e344caf125fc76c80ca9c40822 Mon Sep 17 00:00:00 2001
From: Merov Linden <merov@lindenlab.com>
Date: Wed, 6 Apr 2011 14:51:00 -0700
Subject: STORM-610 : Fix init of and default color value

---
 indra/newview/app_settings/settings.xml | 6 +++---
 indra/newview/llwaterparammanager.cpp   | 9 +++++++--
 2 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml
index 3d89d294f2..b8c2350edd 100644
--- a/indra/newview/app_settings/settings.xml
+++ b/indra/newview/app_settings/settings.xml
@@ -11936,9 +11936,9 @@
       <string>Color4</string>
       <key>Value</key>
       <array>
-        <real>22</real>
-        <real>43</real>
-        <real>54</real>
+        <real>0.0863</real>
+        <real>0.168</real>
+        <real>0.212</real>
         <real>0</real>
       </array>
     </map>
diff --git a/indra/newview/llwaterparammanager.cpp b/indra/newview/llwaterparammanager.cpp
index 3d3d43e20d..4b3a9a4dc3 100644
--- a/indra/newview/llwaterparammanager.cpp
+++ b/indra/newview/llwaterparammanager.cpp
@@ -73,6 +73,7 @@ LLWaterParamManager::LLWaterParamManager() :
 	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)
 {
 }
@@ -474,10 +475,14 @@ void LLWaterParamManager::initOverrides()
 {
 	// Override fog color from the current preset with the saved setting.
 	LLColor4 fog_color_override = gSavedSettings.getColor4("WaterFogColor");
-	mCurParams.set("waterFogColor", mPrevFogColor = mFogColor = fog_color_override);
+	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");
-	mCurParams.set("waterFogDensity", mPrevFogDensity = mFogDensity = fog_density);
+	mPrevFogDensity = fog_density;
+	mFogDensity = fog_density;
+	mCurParams.set("waterFogDensity", fog_density);
 	setDensitySliderValue(mFogDensity.mExp);
 }
-- 
cgit v1.2.3