diff options
author | Merov Linden <merov@lindenlab.com> | 2011-02-04 15:25:10 -0800 |
---|---|---|
committer | Merov Linden <merov@lindenlab.com> | 2011-02-04 15:25:10 -0800 |
commit | 422174a804a196d108a656c1043d94ab525d84ec (patch) | |
tree | d0e36ada9314a0e157f93870cd2e78d8e93671d9 /indra/newview/llwaterparammanager.h | |
parent | 6c76421814bf3e80754d0d7d172b175e1edd3ba8 (diff) | |
parent | 91f3c204b51adf9ac1775716dc20fb9d82a8c13c (diff) |
STORM-610 : Pull into viewer-development
Diffstat (limited to 'indra/newview/llwaterparammanager.h')
-rw-r--r-- | indra/newview/llwaterparammanager.h | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/indra/newview/llwaterparammanager.h b/indra/newview/llwaterparammanager.h index c479f1861c..20556926ab 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; }; |