Fix water fog consolidation in underwater shaders.

Add plumbing facilities to allow current and next moon textures to be passed to moon shader.

Modify moon shader to blend between current and next moon textures by blend factor.

2 files changed, 14 insertions, 2 deletions

diff --git a/indra/llinventory/llsettingssky.cpp b/indra/llinventory/llsettingssky.cpp
index 4763215cff..38574c4ef8 100644
--- a/indra/llinventory/llsettingssky.cpp
+++ b/indra/llinventory/llsettingssky.cpp
@@ -602,8 +602,8 @@ LLSD LLSettingsSky::defaults()
 
     dfltsetting[SETTING_BLOOM_TEXTUREID]    = IMG_BLOOM1;
     dfltsetting[SETTING_CLOUD_TEXTUREID]    = DEFAULT_CLOUD_ID;
-    dfltsetting[SETTING_MOON_TEXTUREID]     = DEFAULT_MOON_ID; // gMoonTextureID;   // These two are returned by the login... wow!
-    dfltsetting[SETTING_SUN_TEXTUREID]      = DEFAULT_SUN_ID;  // gSunTextureID;
+    dfltsetting[SETTING_MOON_TEXTUREID]     = GetDefaultMoonTextureId();
+    dfltsetting[SETTING_SUN_TEXTUREID]      = GetDefaultSunTextureId();
 
     dfltsetting[SETTING_TYPE] = "sky";
 
@@ -1053,3 +1053,13 @@ LLUUID LLSettingsSky::GetDefaultAssetId()
 {
     return DEFAULT_ASSET_ID;
 }
+
+LLUUID LLSettingsSky::GetDefaultSunTextureId()
+{
+    return DEFAULT_SUN_ID;
+}
+
+LLUUID LLSettingsSky::GetDefaultMoonTextureId()
+{
+    return DEFAULT_MOON_ID;
+}
diff --git a/indra/llinventory/llsettingssky.h b/indra/llinventory/llsettingssky.h
index fd613e4299..0cdd064624 100644
--- a/indra/llinventory/llsettingssky.h
+++ b/indra/llinventory/llsettingssky.h
@@ -412,6 +412,8 @@ public:
     virtual LLSettingsBase::ptr_t buildDerivedClone() SETTINGS_OVERRIDE { return buildClone(); }
 
     static LLUUID GetDefaultAssetId();
+    static LLUUID GetDefaultSunTextureId();
+    static LLUUID GetDefaultMoonTextureId();
 
 protected:
     static const std::string SETTING_LEGACY_EAST_ANGLE;