diff options
Diffstat (limited to 'OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs')
-rw-r--r-- | OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs | 16 |
1 files changed, 12 insertions, 4 deletions
diff --git a/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs b/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs index 514a65b..f9e2b2f 100644 --- a/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs +++ b/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs | |||
@@ -433,11 +433,16 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer | |||
433 | 433 | ||
434 | string reason; | 434 | string reason; |
435 | string version; | 435 | string version; |
436 | if (!m_aScene.SimulationService.QueryAccess(finalDestination, sp.ControllingClient.AgentId, Vector3.Zero, out version, out reason)) | 436 | if (!m_aScene.SimulationService.QueryAccess( |
437 | finalDestination, sp.ControllingClient.AgentId, Vector3.Zero, out version, out reason)) | ||
437 | { | 438 | { |
438 | sp.ControllingClient.SendTeleportFailed("Teleport failed: " + reason); | 439 | sp.ControllingClient.SendTeleportFailed(reason); |
439 | ResetFromTransit(sp.UUID); | 440 | ResetFromTransit(sp.UUID); |
440 | 441 | ||
442 | m_log.DebugFormat( | ||
443 | "[ENTITY TRANSFER MODULE]: {0} was stopped from teleporting from {1} to {2} because {3}", | ||
444 | sp.Name, sp.Scene.RegionInfo.RegionName, finalDestination.RegionName, reason); | ||
445 | |||
441 | return; | 446 | return; |
442 | } | 447 | } |
443 | 448 | ||
@@ -480,10 +485,13 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer | |||
480 | bool logout = false; | 485 | bool logout = false; |
481 | if (!CreateAgent(sp, reg, finalDestination, agentCircuit, teleportFlags, out reason, out logout)) | 486 | if (!CreateAgent(sp, reg, finalDestination, agentCircuit, teleportFlags, out reason, out logout)) |
482 | { | 487 | { |
483 | sp.ControllingClient.SendTeleportFailed( | 488 | sp.ControllingClient.SendTeleportFailed(String.Format("Teleport refused: {0}", reason)); |
484 | String.Format("Teleport refused: {0}", reason)); | ||
485 | ResetFromTransit(sp.UUID); | 489 | ResetFromTransit(sp.UUID); |
486 | 490 | ||
491 | m_log.DebugFormat( | ||
492 | "[ENTITY TRANSFER MODULE]: Teleport of {0} from {1} to {2} was refused because {3}", | ||
493 | sp.Name, sp.Scene.RegionInfo.RegionName, finalDestination.RegionName, reason); | ||
494 | |||
487 | return; | 495 | return; |
488 | } | 496 | } |
489 | 497 | ||