diff options
author | UbitUmarov | 2017-05-29 05:22:21 +0100 |
---|---|---|
committer | UbitUmarov | 2017-05-29 05:22:21 +0100 |
commit | 8f86de265c6187a61dde12fb122c1ae017b6ecf6 (patch) | |
tree | 66bfeb92d6847d30462cb9f2c2040151bc861ea0 /OpenSim/Region/CoreModules/Framework/EntityTransfer | |
parent | no.. still a fail (diff) | |
download | opensim-SC_OLD-8f86de265c6187a61dde12fb122c1ae017b6ecf6.zip opensim-SC_OLD-8f86de265c6187a61dde12fb122c1ae017b6ecf6.tar.gz opensim-SC_OLD-8f86de265c6187a61dde12fb122c1ae017b6ecf6.tar.bz2 opensim-SC_OLD-8f86de265c6187a61dde12fb122c1ae017b6ecf6.tar.xz |
some cleanup and assume Linux/mono DNS is just broken...
Diffstat (limited to 'OpenSim/Region/CoreModules/Framework/EntityTransfer')
-rw-r--r-- | OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs b/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs index 9959f6e..7214414 100644 --- a/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs +++ b/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs | |||
@@ -157,7 +157,7 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer | |||
157 | m_idCache = new ExpiringCache<ulong, DateTime>(); | 157 | m_idCache = new ExpiringCache<ulong, DateTime>(); |
158 | m_bannedRegions.Add(pAgentID, m_idCache, TimeSpan.FromSeconds(newTime)); | 158 | m_bannedRegions.Add(pAgentID, m_idCache, TimeSpan.FromSeconds(newTime)); |
159 | } | 159 | } |
160 | m_idCache.Add(pRegionHandle, DateTime.UtcNow + TimeSpan.FromSeconds(extendTime), TimeSpan.FromSeconds(extendTime)); | 160 | m_idCache.Add(pRegionHandle, DateTime.UtcNow + TimeSpan.FromSeconds(extendTime), extendTime); |
161 | } | 161 | } |
162 | 162 | ||
163 | // Remove the agent from the region's banned list | 163 | // Remove the agent from the region's banned list |
@@ -1488,13 +1488,11 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer | |||
1488 | Math.Max(scene.RegionInfo.RegionSizeX, scene.RegionInfo.RegionSizeY)); | 1488 | Math.Max(scene.RegionInfo.RegionSizeX, scene.RegionInfo.RegionSizeY)); |
1489 | 1489 | ||
1490 | if (neighbourRegion == null) | 1490 | if (neighbourRegion == null) |
1491 | { | ||
1492 | failureReason = "no region found"; // debug -> to remove | ||
1493 | return null; | 1491 | return null; |
1494 | } | 1492 | |
1495 | if (m_bannedRegionCache.IfBanned(neighbourRegion.RegionHandle, agentID)) | 1493 | if (m_bannedRegionCache.IfBanned(neighbourRegion.RegionHandle, agentID)) |
1496 | { | 1494 | { |
1497 | failureReason = "Access Denied"; | 1495 | failureReason = "Access Denied or Temporary not possible"; |
1498 | return null; | 1496 | return null; |
1499 | } | 1497 | } |
1500 | 1498 | ||
@@ -1506,14 +1504,15 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer | |||
1506 | pos.Z); | 1504 | pos.Z); |
1507 | 1505 | ||
1508 | string homeURI = scene.GetAgentHomeURI(agentID); | 1506 | string homeURI = scene.GetAgentHomeURI(agentID); |
1509 | 1507 | ||
1510 | if (!scene.SimulationService.QueryAccess( | 1508 | if (!scene.SimulationService.QueryAccess( |
1511 | neighbourRegion, agentID, homeURI, false, newpos, | 1509 | neighbourRegion, agentID, homeURI, false, newpos, |
1512 | scene.GetFormatsOffered(), ctx, out failureReason)) | 1510 | scene.GetFormatsOffered(), ctx, out failureReason)) |
1513 | { | 1511 | { |
1514 | // remember the fail | 1512 | // remember the fail |
1515 | m_bannedRegionCache.Add(neighbourRegion.RegionHandle, agentID); | 1513 | m_bannedRegionCache.Add(neighbourRegion.RegionHandle, agentID); |
1516 | failureReason = "Access Denied"; | 1514 | if(String.IsNullOrWhiteSpace(failureReason)) |
1515 | failureReason = "Access Denied"; | ||
1517 | return null; | 1516 | return null; |
1518 | } | 1517 | } |
1519 | 1518 | ||
@@ -2171,7 +2170,7 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer | |||
2171 | InformClientOfNeighbourAsync(sp, cagents[count], neighbour, ipe, true); | 2170 | InformClientOfNeighbourAsync(sp, cagents[count], neighbour, ipe, true); |
2172 | else | 2171 | else |
2173 | { | 2172 | { |
2174 | m_log.DebugFormat("[ENTITY TRANSFER MODULE]: DNS for neighbour {0} lost", neighbour.ExternalHostName); | 2173 | m_log.DebugFormat("[ENTITY TRANSFER MODULE]: lost DNS resolution for neighbour {0}", neighbour.ExternalHostName); |
2175 | } | 2174 | } |
2176 | count++; | 2175 | count++; |
2177 | } | 2176 | } |