diff options
| author | Rider Linden <rider@lindenlab.com> | 2018-09-21 19:11:39 +0000 |
|---|---|---|
| committer | Rider Linden <rider@lindenlab.com> | 2018-09-21 19:11:39 +0000 |
| commit | d0b214fec699cac8b0851e69a87bedb36c895a85 (patch) | |
| tree | 4f1aad5d685694d66bff9a59fc0836e07b5fae9e /indra/newview/llfloatereditextdaycycle.cpp | |
| parent | 339a5449fc89700ee22c53ecd60adbed6faba1a5 (diff) | |
| parent | 1bd1a101092d890b42eec8c59b97b8f267502356 (diff) | |
Merged in andreykproductengine/maint-eep (pull request #106)
SL-1061 EEP prevent invalid settings from getting into environment
Diffstat (limited to 'indra/newview/llfloatereditextdaycycle.cpp')
| -rw-r--r-- | indra/newview/llfloatereditextdaycycle.cpp | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/indra/newview/llfloatereditextdaycycle.cpp b/indra/newview/llfloatereditextdaycycle.cpp index 3531e9c4e8..5b083e8503 100644 --- a/indra/newview/llfloatereditextdaycycle.cpp +++ b/indra/newview/llfloatereditextdaycycle.cpp @@ -437,6 +437,19 @@ void LLFloaterEditExtDayCycle::refresh() void LLFloaterEditExtDayCycle::setEditDayCycle(const LLSettingsDay::ptr_t &pday) { mEditDay = pday->buildDeepCloneAndUncompress(); + + if (mEditDay->isTrackEmpty(LLSettingsDay::TRACK_WATER)) + { + LL_WARNS("ENVDAYEDIT") << "No water frames found, generating replacement" << LL_ENDL; + mEditDay->setWaterAtKeyframe(LLSettingsVOWater::buildDefaultWater(), .5f); + } + + if (mEditDay->isTrackEmpty(LLSettingsDay::TRACK_GROUND_LEVEL)) + { + LL_WARNS("ENVDAYEDIT") << "No sky frames found, generating replacement" << LL_ENDL; + mEditDay->setSkyAtKeyframe(LLSettingsVOSky::buildDefaultSky(), .5f, LLSettingsDay::TRACK_GROUND_LEVEL); + } + updateEditEnvironment(); LLEnvironment::instance().setSelectedEnvironment(LLEnvironment::ENV_EDIT, LLEnvironment::TRANSITION_INSTANT); LLEnvironment::instance().updateEnvironment(LLEnvironment::TRANSITION_INSTANT); |