Merged with viewer-development.

The reason was to manually resolve a couple of merge problems, as upstream has had several changes since this was applied, and some of the changes overlapped.

1 files changed, 6 insertions, 0 deletions

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;
 };