diff options
| author | UbitUmarov | 2016-08-01 00:35:48 +0100 |
|---|---|---|
| committer | UbitUmarov | 2016-08-01 00:35:48 +0100 |
| commit | 8d5bc71a53db94dcda5367883915b226b704f172 (patch) | |
| tree | 3d85b59d77332c325245ec45a84ccf0c0df2bdd0 /OpenSim/Region/CoreModules/Framework/EntityTransfer | |
| parent | on 0.8 grids compatibility code just do a BIG range request. It whould be do... (diff) | |
| download | opensim-SC_OLD-8d5bc71a53db94dcda5367883915b226b704f172.zip opensim-SC_OLD-8d5bc71a53db94dcda5367883915b226b704f172.tar.gz opensim-SC_OLD-8d5bc71a53db94dcda5367883915b226b704f172.tar.bz2 opensim-SC_OLD-8d5bc71a53db94dcda5367883915b226b704f172.tar.xz | |
bug fix: use UtcNow in both places :)
Diffstat (limited to 'OpenSim/Region/CoreModules/Framework/EntityTransfer')
| -rw-r--r-- | OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs b/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs index 980d3cc..8aadec6 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 | |||
| 2125 | psh |= (ulong)pY & 0xffffff00ul; | 2125 | psh |= (ulong)pY & 0xffffff00ul; |
| 2126 | 2126 | ||
| 2127 | lock (m_notFoundLocations) | 2127 | lock (m_notFoundLocations) |
| 2128 | m_notFoundLocations[psh] = DateTime.Now + TimeSpan.FromSeconds(30);; | 2128 | m_notFoundLocations[psh] = DateTime.UtcNow + TimeSpan.FromSeconds(30); |
| 2129 | } | 2129 | } |
| 2130 | // Test to see of this point is in any of the 'not found' areas. | 2130 | // Test to see of this point is in any of the 'not found' areas. |
| 2131 | // Return 'true' if the point is found inside the 'not found' areas. | 2131 | // Return 'true' if the point is found inside the 'not found' areas. |
| @@ -2146,7 +2146,7 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer | |||
| 2146 | return false; | 2146 | return false; |
| 2147 | } | 2147 | } |
| 2148 | } | 2148 | } |
| 2149 | 2149 | ||
| 2150 | private void DoExpiration() | 2150 | private void DoExpiration() |
| 2151 | { | 2151 | { |
| 2152 | List<ulong> m_toRemove = new List<ulong>();; | 2152 | List<ulong> m_toRemove = new List<ulong>();; |