diff options
| author | Oz Linden <oz@lindenlab.com> | 2011-04-10 22:40:13 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2011-04-10 22:40:13 -0400 |
| commit | ee9eef505279bf3983ec5fe4ce64ba3c38f0a76a (patch) | |
| tree | 73ffbc468a65c2d4ed4c0dede4e24ad9e7cd69fd /indra/newview/llwaterparammanager.h | |
| parent | a248ed2a2ccb89c9716f8657ef3c52269518c909 (diff) | |
| parent | 60bceb759b592348b403689ffa8ed9c768126f8b (diff) | |
merge changes for storm-1057
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..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; }; |