diff options
| author | Steven Bennetts <steve@lindenlab.com> | 2008-05-11 20:56:42 +0000 |
|---|---|---|
| committer | Steven Bennetts <steve@lindenlab.com> | 2008-05-11 20:56:42 +0000 |
| commit | 875606a04d656ef6e5600a3a7fb6e8b52feb1945 (patch) | |
| tree | 7189f1cd0a2b043446e6f145cb9c72b3a1f125aa /indra/newview/llwaterparammanager.h | |
| parent | 783e05058c5d74984ab554fdc60aa06839b9b5c9 (diff) | |
QAR-566 maint-viewer-5-merge-2
Effective merge: release@84102 maint-viewer-5@86348 -> maint-viewer-5-merge-2
Actual merge maint-viewer-5-merge-2 -r 87239 : 87246 -> release
Diffstat (limited to 'indra/newview/llwaterparammanager.h')
| -rw-r--r-- | indra/newview/llwaterparammanager.h | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/indra/newview/llwaterparammanager.h b/indra/newview/llwaterparammanager.h index 6892bb1924..937dd9e388 100644 --- a/indra/newview/llwaterparammanager.h +++ b/indra/newview/llwaterparammanager.h @@ -315,18 +315,16 @@ public: F32 mDensitySliderValue; private: - // our parameter manager singleton instance - static LLWaterParamManager * sInstance; - -private: - LLVector4 mWaterPlane; F32 mWaterFogKS; + + // our parameter manager singleton instance + static LLWaterParamManager * sInstance; }; inline void LLWaterParamManager::setDensitySliderValue(F32 val) { - val /= 10; + val /= 10.0f; val = 1.0f - val; val *= val * val; // val *= val; |