From 2a4dea528f670b9bb1f77ef27a8a1dd16603d114 Mon Sep 17 00:00:00 2001
From: Jacek Antonelli
Date: Fri, 15 Aug 2008 23:45:50 -0500
Subject: Second Life viewer sources 1.20.7

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

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

diff --git a/linden/indra/newview/llwaterparammanager.h b/linden/indra/newview/llwaterparammanager.h
index ad40c12..6c9ce3e 100644
--- a/linden/indra/newview/llwaterparammanager.h
+++ b/linden/indra/newview/llwaterparammanager.h
@@ -315,18 +315,16 @@ public:
 	F32 mDensitySliderValue;
 
 private:
-	// our parameter manager singleton instance
-	static LLWaterParamManager * sInstance;
-
-private:
-
 	LLVector4 mWaterPlane;
 	F32 mWaterFogKS;
+
+	// our parameter manager singleton instance
+	static LLWaterParamManager * sInstance;
 };
 
 inline void LLWaterParamManager::setDensitySliderValue(F32 val)
 {
-	val /= 10;
+	val /= 10.0f;
 	val = 1.0f - val;
 	val *= val * val;
 //	val *= val;
-- 
cgit v1.1