Mods to hook up water settings to water normals for rendering with support for current to next blending.

Modify LLSettingsFoo::buildDefaultFoo to use a static and avoid re-validation of default sky/water/daycycle settings.

Remove all references to gSun/MoonTextureId globals (they should come from sky settings now).

1 files changed, 8 insertions, 0 deletions

diff --git a/indra/llinventory/llsettingssky.cpp b/indra/llinventory/llsettingssky.cpp
index db574f2eec..c25f9a5b2c 100644
--- a/indra/llinventory/llsettingssky.cpp
+++ b/indra/llinventory/llsettingssky.cpp
@@ -382,8 +382,16 @@ LLSettingsSky::LLSettingsSky():
 {
 }
 
+void LLSettingsSky::replaceSettings(LLSD settings)
+{
+    LLSettingsBase::replaceSettings(settings);
+
+}
+
 void LLSettingsSky::blend(const LLSettingsBase::ptr_t &end, F64 blendf) 
 {
+    llassert(getSettingsType() == end->getSettingsType());
+
     LLSettingsSky::ptr_t other = PTR_NAMESPACE::dynamic_pointer_cast<LLSettingsSky>(end);
     LLSD blenddata = interpolateSDMap(mSettings, other->mSettings, blendf);