diff options
author | Jacek Antonelli | 2008-08-15 23:45:50 -0500 |
---|---|---|
committer | Jacek Antonelli | 2008-08-15 23:45:50 -0500 |
commit | 2a4dea528f670b9bb1f77ef27a8a1dd16603d114 (patch) | |
tree | 95c68e362703c9099d571ecbdc6142b1cda1e005 /linden/indra/newview/llwaterparammanager.h | |
parent | Second Life viewer sources 1.20.6 (diff) | |
download | meta-impy-2a4dea528f670b9bb1f77ef27a8a1dd16603d114.zip meta-impy-2a4dea528f670b9bb1f77ef27a8a1dd16603d114.tar.gz meta-impy-2a4dea528f670b9bb1f77ef27a8a1dd16603d114.tar.bz2 meta-impy-2a4dea528f670b9bb1f77ef27a8a1dd16603d114.tar.xz |
Second Life viewer sources 1.20.7
Diffstat (limited to 'linden/indra/newview/llwaterparammanager.h')
-rw-r--r-- | linden/indra/newview/llwaterparammanager.h | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/linden/indra/newview/llwaterparammanager.h b/linden/indra/newview/llwaterparammanager.h index ad40c12..6c9ce3e 100644 --- a/linden/indra/newview/llwaterparammanager.h +++ b/linden/indra/newview/llwaterparammanager.h | |||
@@ -315,18 +315,16 @@ public: | |||
315 | F32 mDensitySliderValue; | 315 | F32 mDensitySliderValue; |
316 | 316 | ||
317 | private: | 317 | private: |
318 | // our parameter manager singleton instance | ||
319 | static LLWaterParamManager * sInstance; | ||
320 | |||
321 | private: | ||
322 | |||
323 | LLVector4 mWaterPlane; | 318 | LLVector4 mWaterPlane; |
324 | F32 mWaterFogKS; | 319 | F32 mWaterFogKS; |
320 | |||
321 | // our parameter manager singleton instance | ||
322 | static LLWaterParamManager * sInstance; | ||
325 | }; | 323 | }; |
326 | 324 | ||
327 | inline void LLWaterParamManager::setDensitySliderValue(F32 val) | 325 | inline void LLWaterParamManager::setDensitySliderValue(F32 val) |
328 | { | 326 | { |
329 | val /= 10; | 327 | val /= 10.0f; |
330 | val = 1.0f - val; | 328 | val = 1.0f - val; |
331 | val *= val * val; | 329 | val *= val * val; |
332 | // val *= val; | 330 | // val *= val; |