Finishes the OpenRegionSettings module, adds a new panel to Region/Estate for OpenRegionSettings, adds the new CAPS based WindLight Settings module, cleans up a few UI parts, and rebuilds the ToS window to support OpenSim regions better.

1 files changed, 7 insertions, 0 deletions

diff --git a/linden/indra/newview/llwaterparammanager.h b/linden/indra/newview/llwaterparammanager.h
index 588e436..96dd1aa 100644
--- a/linden/indra/newview/llwaterparammanager.h
+++ b/linden/indra/newview/llwaterparammanager.h
@@ -304,6 +304,8 @@ public:
         // singleton pattern implementation
         static LLWaterParamManager * instance();
 
+        void SetMixTime(LLWaterParamSet* mixSet, F32 mixTime);
+
 public:
 
         LLWaterParamSet mCurParams;
@@ -334,6 +336,11 @@ private:
         LLVector4 mWaterPlane;
         F32 mWaterFogKS;
 
+        BOOL sNeedsMix;
+        LLWaterParamSet* sMixSet;
+        F32 sMixTime;
+        F32 sMixCount;
+
         // our parameter manager singleton instance
         static LLWaterParamManager * sInstance;