Fix 16F enum for compat w/ SL gl headers on Mac.

Make density profile/layer parsing handle when
LLSD heard you liked arrays so it put an array
in your array.

1 files changed, 9 insertions, 1 deletions

diff --git a/indra/newview/llenvironment.cpp b/indra/newview/llenvironment.cpp
index c67fcf880e..1936a67a18 100644
--- a/indra/newview/llenvironment.cpp
+++ b/indra/newview/llenvironment.cpp
@@ -1157,7 +1157,15 @@ void LLEnvironment::legacyLoadAllPresets()
                 std::string name(gDirUtilp->getBaseFileName(LLURI::unescape(path), true));
 
                 LLSettingsDay::ptr_t day = LLSettingsVODay::buildFromLegacyPreset(name, data);
-                LLEnvironment::instance().addDayCycle(day);
+                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;
+                }
 
 #ifdef EXPORT_PRESETS
                 std::string exportfile = LLURI::escape(name) + "(new).xml";