From 8d5bc71a53db94dcda5367883915b226b704f172 Mon Sep 17 00:00:00 2001 From: UbitUmarov Date: Mon, 1 Aug 2016 00:35:48 +0100 Subject: [PATCH 1/2] bug fix: use UtcNow in both places :) --- .../Framework/EntityTransfer/EntityTransferModule.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs b/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs index 980d3cc47c..8aadec648b 100644 --- a/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs +++ b/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs @@ -2125,7 +2125,7 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer psh |= (ulong)pY & 0xffffff00ul; lock (m_notFoundLocations) - m_notFoundLocations[psh] = DateTime.Now + TimeSpan.FromSeconds(30);; + m_notFoundLocations[psh] = DateTime.UtcNow + TimeSpan.FromSeconds(30); } // Test to see of this point is in any of the 'not found' areas. // Return 'true' if the point is found inside the 'not found' areas. @@ -2146,7 +2146,7 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer return false; } } - + private void DoExpiration() { List m_toRemove = new List();; From 708d2cd4136cc2505e97b5e6b8b1490562b1c771 Mon Sep 17 00:00:00 2001 From: UbitUmarov Date: Mon, 1 Aug 2016 00:58:16 +0100 Subject: [PATCH 2/2] replace DateTime.Now by utcNow in another place --- .../Framework/EntityTransfer/EntityTransferModule.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs b/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs index 8aadec648b..58f3ddea19 100644 --- a/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs +++ b/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs @@ -136,7 +136,7 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer { if (m_idCache.TryGetValue(pRegionHandle, out m_banUntil)) { - if (DateTime.Now < m_banUntil) + if (DateTime.UtcNow < m_banUntil) { ret = true; } @@ -157,7 +157,7 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer m_idCache = new ExpiringCache(); m_bannedRegions.Add(pAgentID, m_idCache, TimeSpan.FromSeconds(newTime)); } - m_idCache.Add(pRegionHandle, DateTime.Now + TimeSpan.FromSeconds(extendTime), TimeSpan.FromSeconds(extendTime)); + m_idCache.Add(pRegionHandle, DateTime.UtcNow + TimeSpan.FromSeconds(extendTime), TimeSpan.FromSeconds(extendTime)); } // Remove the agent from the region's banned list