diff options
| author | andreykproductengine <akleshchev@productengine.com> | 2016-11-18 20:59:30 +0200 |
|---|---|---|
| committer | andreykproductengine <akleshchev@productengine.com> | 2016-11-18 20:59:30 +0200 |
| commit | c74d1acbfc3e734f789c7f916e37ceb9fcc26b16 (patch) | |
| tree | 53904c5d8a3c7885fd85520ba20c5bb06cc28480 /indra/newview/llenvmanager.cpp | |
| parent | 11c03f8fe3277313c27d5a35302c79d0d09bd670 (diff) | |
MAINT-2141 Fix for Sky Cloud Coverage reverting.
Diffstat (limited to 'indra/newview/llenvmanager.cpp')
| -rw-r--r-- | indra/newview/llenvmanager.cpp | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/indra/newview/llenvmanager.cpp b/indra/newview/llenvmanager.cpp index a626ad1bff..b97e483fd9 100644 --- a/indra/newview/llenvmanager.cpp +++ b/indra/newview/llenvmanager.cpp @@ -609,10 +609,15 @@ bool LLEnvManagerNew::useRegionSky() return true; } - // *TODO: Support fixed sky from region. - - // Otherwise apply region day cycle. + // Otherwise apply region day cycle/skies. LL_DEBUGS("Windlight") << "Applying region sky" << LL_ENDL; + + // *TODO: Support fixed sky from region. Just do sky reset for now. + if (region_settings.getSkyMap().size() == 1) + { + // Region is set to fixed sky. Reset. + useSkyParams(region_settings.getSkyMap().beginMap()->second); + } return useDayCycleParams( region_settings.getWLDayCycle(), LLEnvKey::SCOPE_REGION, |