Watter settings active and start of new joystick button type.

1 files changed, 18 insertions, 0 deletions

diff --git a/indra/newview/llenvadapters.cpp b/indra/newview/llenvadapters.cpp
index 8bed0737dd..34fd862655 100644
--- a/indra/newview/llenvadapters.cpp
+++ b/indra/newview/llenvadapters.cpp
@@ -28,6 +28,7 @@
 #include "llenvadapters.h"
 
 #include "llsettingssky.h"
+#include "llsettingswater.h"
 //=========================================================================
 
 LLSkySettingsAdapter::LLSkySettingsAdapter():
@@ -53,3 +54,20 @@ LLSkySettingsAdapter::LLSkySettingsAdapter():
 {
 
 }
+
+LLWatterSettingsAdapter::LLWatterSettingsAdapter():
+    mFogColor(LLColor4((22.f / 255.f), (43.f / 255.f), (54.f / 255.f), (0.0f)), LLSettingsWater::SETTING_FOG_COLOR, "WaterFogColor"),
+    mFogDensity(4, LLSettingsWater::SETTING_FOG_DENSITY, 2),
+    mUnderWaterFogMod(0.25, LLSettingsWater::SETTING_FOG_MOD),
+    mNormalScale(LLVector3(2.f, 2.f, 2.f), LLSettingsWater::SETTING_NORMAL_SCALE),
+    mFresnelScale(0.5f, LLSettingsWater::SETTING_FRESNEL_SCALE),
+    mFresnelOffset(0.4f, LLSettingsWater::SETTING_FRESNEL_OFFSET),
+    mScaleAbove(0.025f, LLSettingsWater::SETTING_SCALE_ABOVE),
+    mScaleBelow(0.2f, LLSettingsWater::SETTING_SCALE_BELOW),
+    mBlurMultiplier(0.1f, LLSettingsWater::SETTING_BLUR_MULTIPILER),
+    mWave1Dir(LLVector2(0.5f, 0.5f), LLSettingsWater::SETTING_WAVE1_DIR),
+    mWave2Dir(LLVector2(0.5f, 0.5f), LLSettingsWater::SETTING_WAVE2_DIR)
+
+{
+
+}