From cdfd66eec27355930a50309273961ad4bc7e4606 Mon Sep 17 00:00:00 2001
From: Merov Linden <merov@lindenlab.com>
Date: Tue, 5 Apr 2011 22:58:53 -0700
Subject: STORM-610 : Changes to water color and density in the Environment
 Editor now persist between sessions.

---
 indra/newview/llwaterparammanager.h | 6 ++++++
 1 file changed, 6 insertions(+)

(limited to 'indra/newview/llwaterparammanager.h')

diff --git a/indra/newview/llwaterparammanager.h b/indra/newview/llwaterparammanager.h
index c479f1861c..f465034c39 100644
--- a/indra/newview/llwaterparammanager.h
+++ b/indra/newview/llwaterparammanager.h
@@ -284,6 +284,9 @@ public:
 	// singleton pattern implementation
 	static LLWaterParamManager * instance();
 
+private:
+	void initOverrides();
+	
 public:
 
 	LLWaterParamSet mCurParams;
@@ -314,6 +317,9 @@ private:
 	LLVector4 mWaterPlane;
 	F32 mWaterFogKS;
 
+	LLColor4 mPrevFogColor;
+	F32      mPrevFogDensity;
+
 	// our parameter manager singleton instance
 	static LLWaterParamManager * sInstance;
 };
-- 
cgit v1.2.3