diff options
Diffstat (limited to 'indra/newview/llwlparammanager.cpp')
| -rw-r--r-- | indra/newview/llwlparammanager.cpp | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/indra/newview/llwlparammanager.cpp b/indra/newview/llwlparammanager.cpp index 4431b3f5c0..0913c4dec2 100644 --- a/indra/newview/llwlparammanager.cpp +++ b/indra/newview/llwlparammanager.cpp @@ -580,7 +580,7 @@ void LLWLParamManager::update(LLViewerCamera * cam) } } -void LLWLParamManager::applyUserPrefs() +void LLWLParamManager::applyUserPrefs(bool interpolate) { LL_DEBUGS("Windlight") << "Applying sky prefs" << LL_ENDL; clearParamSetsOfScope(LLEnvKey::SCOPE_REGION); @@ -592,13 +592,10 @@ void LLWLParamManager::applyUserPrefs() const LLEnvironmentSettings& region_settings = LLEnvManagerNew::instance().getRegionSettings(); - if (0) // *TODO: interpolate? - { - mAnimator.startInterpolation(region_settings.getWaterParams()); - } - addAllSkies(LLEnvKey::SCOPE_REGION, region_settings.getSkyMap()); mDay.loadDayCycle(region_settings.getWLDayCycle(), LLEnvKey::SCOPE_REGION); + LL_DEBUGS("Windlight") << "Applying region time: " << region_settings.getDayTime() + << " = " << region_settings.getDayTime() * 24.0f << " h" << LL_ENDL; resetAnimator(region_settings.getDayTime(), true); } else // apply user-specified settings |