Merge

1 files changed, 17 insertions, 4 deletions

diff --git a/indra/newview/llviewermessage.cpp b/indra/newview/llviewermessage.cpp
index 0597347ca8..e610387b37 100644
--- a/indra/newview/llviewermessage.cpp
+++ b/indra/newview/llviewermessage.cpp
@@ -3780,11 +3780,24 @@ void process_time_synch(LLMessageSystem *mesgsys, void **user_data)
 
 	LLWorld::getInstance()->setSpaceTimeUSec(space_time_usec);
 
-	LL_DEBUGS("WindlightSync") << "Sun phase: " << phase << " rad = " << fmodf(phase / F_TWO_PI + 0.25, 1.f) * 24.f << " h" << LL_ENDL;
+	LL_DEBUGS("ENVIRONMENT") << "Sun phase: " << phase << " rad = " << fmodf(phase / F_TWO_PI + 0.25, 1.f) * 24.f << " h" << LL_ENDL;
 
-    
-	/* LAPRAS
-        We decode these parts of the message but ignore them
+    F32 region_phase = LLEnvironment::instance().getRegionProgress();
+    if (region_phase >= 0.0)
+    {
+        F32 adjusted_phase = fmodf(phase / F_TWO_PI + 0.25, 1.f);
+        F32 delta_phase = adjusted_phase - region_phase;
+
+        LL_DEBUGS("ENVIRONMENT") << "adjusted phase = " << adjusted_phase << " local phase = " << region_phase << " delta = " << delta_phase << LL_ENDL;
+
+        if (!LLEnvironment::instance().isExtendedEnvironmentEnabled() && (fabs(delta_phase) > 0.125))
+        {
+            LL_INFOS("ENVIRONMENT") << "Adjusting environment to match region. adjustment=" << delta_phase << LL_ENDL;
+            LLEnvironment::instance().adjustRegionOffset(delta_phase);
+        }
+    }
+
+	/* We decode these parts of the message but ignore them
         as the real values are provided elsewhere. */
     (void)sun_direction, (void)moon_direction, (void)phase;
 }