diff options
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/Framework/Interfaces/IEntityTransferModule.cs | 2 | ||||
-rw-r--r-- | OpenSim/Region/Framework/Scenes/Scene.cs | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/OpenSim/Region/Framework/Interfaces/IEntityTransferModule.cs b/OpenSim/Region/Framework/Interfaces/IEntityTransferModule.cs index 75c44d5..69be83e 100644 --- a/OpenSim/Region/Framework/Interfaces/IEntityTransferModule.cs +++ b/OpenSim/Region/Framework/Interfaces/IEntityTransferModule.cs | |||
@@ -77,8 +77,8 @@ namespace OpenSim.Region.Framework.Interfaces | |||
77 | /// <summary> | 77 | /// <summary> |
78 | /// Show whether the given agent is being teleported. | 78 | /// Show whether the given agent is being teleported. |
79 | /// </summary> | 79 | /// </summary> |
80 | /// <returns>true if the agent is in the process of being teleported, false otherwise.</returns> | ||
81 | /// <param name='id'>The agent ID</para></param> | 80 | /// <param name='id'>The agent ID</para></param> |
81 | /// <returns>true if the agent is in the process of being teleported, false otherwise.</returns> | ||
82 | bool IsInTransit(UUID id); | 82 | bool IsInTransit(UUID id); |
83 | 83 | ||
84 | bool Cross(ScenePresence agent, bool isFlying); | 84 | bool Cross(ScenePresence agent, bool isFlying); |
diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs index 755b1e6..98a75e4 100644 --- a/OpenSim/Region/Framework/Scenes/Scene.cs +++ b/OpenSim/Region/Framework/Scenes/Scene.cs | |||
@@ -5212,10 +5212,10 @@ namespace OpenSim.Region.Framework.Scenes | |||
5212 | { | 5212 | { |
5213 | if (EntityTransferModule.IsInTransit(agentID)) | 5213 | if (EntityTransferModule.IsInTransit(agentID)) |
5214 | { | 5214 | { |
5215 | reason = "Agent is already in transit on this region"; | 5215 | reason = "Agent is still in transit from this region"; |
5216 | 5216 | ||
5217 | m_log.DebugFormat( | 5217 | m_log.WarnFormat( |
5218 | "[SCENE]: Denying agent {0} entry into {1} since region already has them registered as in transit", | 5218 | "[SCENE]: Denying agent {0} entry into {1} since region still has them registered as in transit", |
5219 | agentID, RegionInfo.RegionName); | 5219 | agentID, RegionInfo.RegionName); |
5220 | 5220 | ||
5221 | return false; | 5221 | return false; |