diff options
| author | Oz Linden <oz@lindenlab.com> | 2011-04-10 22:41:34 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2011-04-10 22:41:34 -0400 |
| commit | fe99404803c0582f845d0d42c0908b96cd6682fb (patch) | |
| tree | 670291989177f3b408c376f01ab70859751fca04 /indra/newview/llwaterparammanager.h | |
| parent | a84c8e0704e363a9b24f3ee56760178267086793 (diff) | |
| parent | 0c05c8c89632d2747ca8b364ff663d1d5505fb4d (diff) | |
merge changes for storm-1118
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; }; |