summaryrefslogtreecommitdiff
path: root/indra/newview/llsettingsvo.cpp
diff options
context:
space:
mode:
authorRider Linden <rider@lindenlab.com>2018-01-25 17:21:25 -0800
committerRider Linden <rider@lindenlab.com>2018-01-25 17:21:25 -0800
commitfbd8a98300277bdbc1885c25eea290560fd8c6c1 (patch)
tree93279d01ba2db5ba25d7fdffe69f46df29e8ed3b /indra/newview/llsettingsvo.cpp
parent9b05a8d1cde1d54e60bf4ead021372427c7d11fd (diff)
Selects correct day cycle. Fix an error validating legacy daycycles.
Diffstat (limited to 'indra/newview/llsettingsvo.cpp')
-rw-r--r--indra/newview/llsettingsvo.cpp6
1 files changed, 4 insertions, 2 deletions
diff --git a/indra/newview/llsettingsvo.cpp b/indra/newview/llsettingsvo.cpp
index 8ba6b2354a..eadc035b3b 100644
--- a/indra/newview/llsettingsvo.cpp
+++ b/indra/newview/llsettingsvo.cpp
@@ -515,7 +515,9 @@ LLSettingsDay::ptr_t LLSettingsVODay::buildFromLegacyMessage(const LLUUID &regio
( SETTING_TRACKS, LLSDArray(watertrack)(skytrack))
( SETTING_FRAMES, frames );
- LLSettingsSky::validation_list_t validations = LLSettingsSky::validationList();
+ LL_WARNS("LAPRAS") << "newsettings=" << newsettings << LL_ENDL;
+
+ LLSettingsSky::validation_list_t validations = LLSettingsDay::validationList();
LLSD results = LLSettingsDay::settingValidation(newsettings, validations);
if (!results["success"].asBoolean())
{
@@ -527,7 +529,7 @@ LLSettingsDay::ptr_t LLSettingsVODay::buildFromLegacyMessage(const LLUUID &regio
if (dayp)
{
- dayp->setInitialized();
+ dayp->initialize();
}
return dayp;
}