diff options
Diffstat (limited to 'indra/newview/llenvironment.cpp')
-rw-r--r-- | indra/newview/llenvironment.cpp | 15 |
1 files changed, 12 insertions, 3 deletions
diff --git a/indra/newview/llenvironment.cpp b/indra/newview/llenvironment.cpp index c67fcf880e..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,8 +1157,17 @@ void LLEnvironment::legacyLoadAllPresets() std::string name(gDirUtilp->getBaseFileName(LLURI::unescape(path), true)); LLSettingsDay::ptr_t day = LLSettingsVODay::buildFromLegacyPreset(name, data); + /*if (day->validate()) + { + LL_INFOS() << "Adding Day Cycle " << name << "." << LL_ENDL; + LLEnvironment::instance().addDayCycle(day); + } + 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); @@ -1174,7 +1183,7 @@ void LLEnvironment::legacyLoadAllPresets() } } - // User water + // User Days { dir = getUserDir("days"); LLDirIterator dir_iter(dir, "*.xml"); |