From c74d1acbfc3e734f789c7f916e37ceb9fcc26b16 Mon Sep 17 00:00:00 2001
From: andreykproductengine <akleshchev@productengine.com>
Date: Fri, 18 Nov 2016 20:59:30 +0200
Subject: MAINT-2141 Fix for Sky Cloud Coverage reverting.

---
 indra/newview/llenvmanager.cpp | 11 ++++++++---
 1 file 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,
-- 
cgit v1.2.3