diff options
| author | Dave SIMmONs <simon@lindenlab.com> | 2011-04-15 15:57:57 -0700 |
|---|---|---|
| committer | Dave SIMmONs <simon@lindenlab.com> | 2011-04-15 15:57:57 -0700 |
| commit | ddd599b3473609788e430adf1895b12a5cb35375 (patch) | |
| tree | c41da37ab77e25cfc76d85448c51103a7b55e2ca /indra/newview/llwaterparammanager.h | |
| parent | ebe0c8204df30a85b8228e81acbcf7945c15220c (diff) | |
| parent | 411a1bfcb6e6f7c0bc6e8afcf8aed447426df340 (diff) | |
Merge
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; }; |