Merge branch 'master' into careminster

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
 
                 string reason;
                 string version;
-                if (!m_aScene.SimulationService.QueryAccess(finalDestination, sp.ControllingClient.AgentId, Vector3.Zero, out version, out reason))
+                if (!m_aScene.SimulationService.QueryAccess(
+                    finalDestination, sp.ControllingClient.AgentId, Vector3.Zero, out version, out reason))
                 {
-                    sp.ControllingClient.SendTeleportFailed("Teleport failed: " + reason);
+                    sp.ControllingClient.SendTeleportFailed(reason);
                     ResetFromTransit(sp.UUID);
 
+                    m_log.DebugFormat(
+                        "[ENTITY TRANSFER MODULE]: {0} was stopped from teleporting from {1} to {2} because {3}",
+                        sp.Name, sp.Scene.RegionInfo.RegionName, finalDestination.RegionName, reason);
+
                     return;
                 }
 
@@ -480,10 +485,13 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
                 bool logout = false;
                 if (!CreateAgent(sp, reg, finalDestination, agentCircuit, teleportFlags, out reason, out logout))
                 {
-                    sp.ControllingClient.SendTeleportFailed(
-                        String.Format("Teleport refused: {0}", reason));
+                    sp.ControllingClient.SendTeleportFailed(String.Format("Teleport refused: {0}", reason));
                     ResetFromTransit(sp.UUID);
 
+                    m_log.DebugFormat(
+                        "[ENTITY TRANSFER MODULE]: Teleport of {0} from {1} to {2} was refused because {3}",
+                        sp.Name, sp.Scene.RegionInfo.RegionName, finalDestination.RegionName, reason);
+
                     return;
                 }