OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'master' into httptests

httptests
UbitUmarov 2016-08-01 01:05:31 +01:00
parent a9befe1c62 708d2cd413
commit 5576a100ce
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
View File

@ -136,7 +136,7 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
{ {
if (m_idCache.TryGetValue(pRegionHandle, out m_banUntil)) if (m_idCache.TryGetValue(pRegionHandle, out m_banUntil))
{ {
if (DateTime.Now < m_banUntil) if (DateTime.UtcNow < m_banUntil)
{ {
ret = true; ret = true;
} }
@ -157,7 +157,7 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
m_idCache = new ExpiringCache<ulong, DateTime>(); m_idCache = new ExpiringCache<ulong, DateTime>();
m_bannedRegions.Add(pAgentID, m_idCache, TimeSpan.FromSeconds(newTime)); 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 // Remove the agent from the region's banned list
@ -2125,7 +2125,7 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
psh |= (ulong)pY & 0xffffff00ul; psh |= (ulong)pY & 0xffffff00ul;
lock (m_notFoundLocations) 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. // 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. // Return 'true' if the point is found inside the 'not found' areas.
@ -2146,7 +2146,7 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
return false; return false;
} }
} }
private void DoExpiration() private void DoExpiration()
{ {
List<ulong> m_toRemove = new List<ulong>();; List<ulong> m_toRemove = new List<ulong>();;