aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/CoreModules/Framework/EntityTransfer
diff options
context:
space:
mode:
authorMelanie2013-01-21 01:46:40 +0100
committerMelanie2013-01-21 01:46:40 +0100
commit0e17887e03fb6d32cdd07838caa56e34103ae8f2 (patch)
tree336e6d912974307c2873ecfe248b0cf6d60706ff /OpenSim/Region/CoreModules/Framework/EntityTransfer
parentImplement HTTP Request froma thread pool to avoid packet congestion (diff)
downloadopensim-SC-0e17887e03fb6d32cdd07838caa56e34103ae8f2.zip
opensim-SC-0e17887e03fb6d32cdd07838caa56e34103ae8f2.tar.gz
opensim-SC-0e17887e03fb6d32cdd07838caa56e34103ae8f2.tar.bz2
opensim-SC-0e17887e03fb6d32cdd07838caa56e34103ae8f2.tar.xz
Allow TeleportCancel packets to reset the transfer state machine
Diffstat (limited to 'OpenSim/Region/CoreModules/Framework/EntityTransfer')
-rw-r--r--OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs6
1 files changed, 6 insertions, 0 deletions
diff --git a/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs b/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
index 7e72d47..0c8a2b1 100644
--- a/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
+++ b/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
@@ -150,6 +150,7 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
150 { 150 {
151 client.OnTeleportHomeRequest += TriggerTeleportHome; 151 client.OnTeleportHomeRequest += TriggerTeleportHome;
152 client.OnTeleportLandmarkRequest += RequestTeleportLandmark; 152 client.OnTeleportLandmarkRequest += RequestTeleportLandmark;
153 client.OnTeleportCancel += TeleportCancel;
153 } 154 }
154 155
155 public virtual void Close() {} 156 public virtual void Close() {}
@@ -993,6 +994,11 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
993 return neighbourRegion; 994 return neighbourRegion;
994 } 995 }
995 996
997 private void TeleportCancel(IClientAPI remoteClient)
998 {
999 m_entityTransferStateMachine.ResetFromTransit(remoteClient.AgentId);
1000 }
1001
996 public bool Cross(ScenePresence agent, bool isFlying) 1002 public bool Cross(ScenePresence agent, bool isFlying)
997 { 1003 {
998 uint x; 1004 uint x;