diff options
| author | Graham Linden graham@lindenlab.com <Graham Linden graham@lindenlab.com> | 2018-03-06 23:11:53 +0000 |
|---|---|---|
| committer | Graham Linden graham@lindenlab.com <Graham Linden graham@lindenlab.com> | 2018-03-06 23:11:53 +0000 |
| commit | 1687719a2523e1a6a9d8ebc8aeac52c530fa8fd0 (patch) | |
| tree | f00fba9fbe9434e4edbd127eefd9c321a01fd278 | |
| parent | 82c84027b2d7b126f2e1df0ad8c5203a3b832a02 (diff) | |
Undo changes to default Sky settings XML.
Undo forced validation of objects built from legacy sky settings.
| -rw-r--r-- | indra/newview/llenvironment.cpp | 11 | ||||
| -rw-r--r-- | indra/newview/llsettingsvo.cpp | 1 |
2 files changed, 6 insertions, 6 deletions
diff --git a/indra/newview/llenvironment.cpp b/indra/newview/llenvironment.cpp index 1936a67a18..c5a1af8747 100644 --- a/indra/newview/llenvironment.cpp +++ b/indra/newview/llenvironment.cpp @@ -1143,7 +1143,7 @@ void LLEnvironment::legacyLoadAllPresets() } } - // System water + // System Days { dir = getSysDir("days"); LLDirIterator dir_iter(dir, "*.xml"); @@ -1157,7 +1157,7 @@ void LLEnvironment::legacyLoadAllPresets() std::string name(gDirUtilp->getBaseFileName(LLURI::unescape(path), true)); LLSettingsDay::ptr_t day = LLSettingsVODay::buildFromLegacyPreset(name, data); - if (day->validate()) + /*if (day->validate()) { LL_INFOS() << "Adding Day Cycle " << name << "." << LL_ENDL; LLEnvironment::instance().addDayCycle(day); @@ -1165,8 +1165,9 @@ void LLEnvironment::legacyLoadAllPresets() else { LL_WARNS() << "Day Cycle " << name << " was not valid. Ignoring." << LL_ENDL; - } - + }*/ + LL_INFOS() << "Adding Day Cycle " << name << "." << LL_ENDL; + LLEnvironment::instance().addDayCycle(day); #ifdef EXPORT_PRESETS std::string exportfile = LLURI::escape(name) + "(new).xml"; std::string exportpath = gDirUtilp->add(getSysDir("new"), exportfile); @@ -1182,7 +1183,7 @@ void LLEnvironment::legacyLoadAllPresets() } } - // User water + // User Days { dir = getUserDir("days"); LLDirIterator dir_iter(dir, "*.xml"); diff --git a/indra/newview/llsettingsvo.cpp b/indra/newview/llsettingsvo.cpp index 61e411496a..30d6684638 100644 --- a/indra/newview/llsettingsvo.cpp +++ b/indra/newview/llsettingsvo.cpp @@ -451,7 +451,6 @@ LLSD LLSettingsVOSky::convertToLegacy(const LLSettingsSky::ptr_t &psky, bool isA LLSD legacy(LLSD::emptyMap()); LLSD settings = psky->getSettings(); -// LEGACY_ATMOSPHERICS convertAtmosphericsToLegacy(legacy, settings); legacy[SETTING_CLOUD_COLOR] = ensureArray4(settings[SETTING_CLOUD_COLOR], 1.0); |