diff options
-rw-r--r-- | OpenSim/Region/ClientStack/Linden/Caps/EventQueue/EventQueueGetModule.cs | 5 | ||||
-rw-r--r-- | OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs | 3 |
2 files changed, 8 insertions, 0 deletions
diff --git a/OpenSim/Region/ClientStack/Linden/Caps/EventQueue/EventQueueGetModule.cs b/OpenSim/Region/ClientStack/Linden/Caps/EventQueue/EventQueueGetModule.cs index 1feece1..c6499cd 100644 --- a/OpenSim/Region/ClientStack/Linden/Caps/EventQueue/EventQueueGetModule.cs +++ b/OpenSim/Region/ClientStack/Linden/Caps/EventQueue/EventQueueGetModule.cs | |||
@@ -512,6 +512,11 @@ namespace OpenSim.Region.ClientStack.Linden | |||
512 | if (DebugLevel > 0) | 512 | if (DebugLevel > 0) |
513 | m_log.DebugFormat("{0} EnableSimulator. handle={1}, endPoint={2}, avatarID={3}", | 513 | m_log.DebugFormat("{0} EnableSimulator. handle={1}, endPoint={2}, avatarID={3}", |
514 | LogHeader, handle, endPoint, avatarID, regionSizeX, regionSizeY); | 514 | LogHeader, handle, endPoint, avatarID, regionSizeX, regionSizeY); |
515 | //debug | ||
516 | if(endPoint == null) | ||
517 | m_log.DebugFormat("EnableSimulator null endpoint"); | ||
518 | if(endPoint.Address == null) | ||
519 | m_log.DebugFormat("EnableSimulator null endpoint"); | ||
515 | 520 | ||
516 | OSD item = EventQueueHelper.EnableSimulator(handle, endPoint, regionSizeX, regionSizeY); | 521 | OSD item = EventQueueHelper.EnableSimulator(handle, endPoint, regionSizeX, regionSizeY); |
517 | Enqueue(item, avatarID); | 522 | Enqueue(item, avatarID); |
diff --git a/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs b/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs index 6b8d597..b6e9a65 100644 --- a/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs +++ b/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs | |||
@@ -1489,10 +1489,12 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer | |||
1489 | 1489 | ||
1490 | if (neighbourRegion == null) | 1490 | if (neighbourRegion == null) |
1491 | { | 1491 | { |
1492 | failureReason = "no region found"; // debug -> to remove | ||
1492 | return null; | 1493 | return null; |
1493 | } | 1494 | } |
1494 | if (m_bannedRegionCache.IfBanned(neighbourRegion.RegionHandle, agentID)) | 1495 | if (m_bannedRegionCache.IfBanned(neighbourRegion.RegionHandle, agentID)) |
1495 | { | 1496 | { |
1497 | failureReason = "Access Denied"; | ||
1496 | return null; | 1498 | return null; |
1497 | } | 1499 | } |
1498 | 1500 | ||
@@ -1511,6 +1513,7 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer | |||
1511 | { | 1513 | { |
1512 | // remember the fail | 1514 | // remember the fail |
1513 | m_bannedRegionCache.Add(neighbourRegion.RegionHandle, agentID); | 1515 | m_bannedRegionCache.Add(neighbourRegion.RegionHandle, agentID); |
1516 | failureReason = "Access Denied"; | ||
1514 | return null; | 1517 | return null; |
1515 | } | 1518 | } |
1516 | 1519 | ||