summaryrefslogtreecommitdiff
path: root/indra/newview/llwaterparammanager.h
diff options
context:
space:
mode:
authorMerov Linden <merov@lindenlab.com>2011-04-05 22:58:53 -0700
committerMerov Linden <merov@lindenlab.com>2011-04-05 22:58:53 -0700
commitcdfd66eec27355930a50309273961ad4bc7e4606 (patch)
treeb91ab8333a1cf36ebbc00a91b5f91fcdc171e21a /indra/newview/llwaterparammanager.h
parentb5c834c6fdcee7d7238bebfc561ecee3ecca3589 (diff)
STORM-610 : Changes to water color and density in the Environment Editor now persist between sessions.
Diffstat (limited to 'indra/newview/llwaterparammanager.h')
-rw-r--r--indra/newview/llwaterparammanager.h6
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;
};