aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs')
-rw-r--r--OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs3
1 files changed, 3 insertions, 0 deletions
diff --git a/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs b/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
index 99bebdd..c93c54d 100644
--- a/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
+++ b/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
@@ -771,8 +771,10 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
771 else if (sp.Flying) 771 else if (sp.Flying)
772 teleportFlags |= (uint)TeleportFlags.IsFlying; 772 teleportFlags |= (uint)TeleportFlags.IsFlying;
773 773
774 sp.IsInLocalTransit = finalDestination.RegionLocY != 0; // HG
774 sp.IsInTransit = true; 775 sp.IsInTransit = true;
775 776
777
776 if (DisableInterRegionTeleportCancellation) 778 if (DisableInterRegionTeleportCancellation)
777 teleportFlags |= (uint)TeleportFlags.DisableCancel; 779 teleportFlags |= (uint)TeleportFlags.DisableCancel;
778 780
@@ -1524,6 +1526,7 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
1524 1526
1525 public bool Cross(ScenePresence agent, bool isFlying) 1527 public bool Cross(ScenePresence agent, bool isFlying)
1526 { 1528 {
1529 agent.IsInLocalTransit = true;
1527 agent.IsInTransit = true; 1530 agent.IsInTransit = true;
1528 CrossAsyncDelegate d = CrossAsync; 1531 CrossAsyncDelegate d = CrossAsync;
1529 d.BeginInvoke(agent, isFlying, CrossCompleted, d); 1532 d.BeginInvoke(agent, isFlying, CrossCompleted, d);