diff options
author | Melanie | 2013-02-24 00:38:57 +0100 |
---|---|---|
committer | Melanie | 2013-02-24 00:38:57 +0100 |
commit | 405da93589856f355defc3c0c1e24c618658cc7e (patch) | |
tree | f4ac8b6e20242cc86289b91c0de47bfdf1421f62 /OpenSim/Region | |
parent | Fix an issue where the viewer would request the seed cap before (diff) | |
download | opensim-SC_OLD-405da93589856f355defc3c0c1e24c618658cc7e.zip opensim-SC_OLD-405da93589856f355defc3c0c1e24c618658cc7e.tar.gz opensim-SC_OLD-405da93589856f355defc3c0c1e24c618658cc7e.tar.bz2 opensim-SC_OLD-405da93589856f355defc3c0c1e24c618658cc7e.tar.xz |
Revert "Allow TeleportCancel packets to reset the transfer state machine"
This reverts commit 0e17887e03fb6d32cdd07838caa56e34103ae8f2.
Diffstat (limited to 'OpenSim/Region')
-rw-r--r-- | OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs b/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs index cb09047..ac4d93d 100644 --- a/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs +++ b/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs | |||
@@ -150,7 +150,6 @@ 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; | ||
154 | } | 153 | } |
155 | 154 | ||
156 | public virtual void Close() {} | 155 | public virtual void Close() {} |
@@ -995,11 +994,6 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer | |||
995 | return neighbourRegion; | 994 | return neighbourRegion; |
996 | } | 995 | } |
997 | 996 | ||
998 | private void TeleportCancel(IClientAPI remoteClient) | ||
999 | { | ||
1000 | m_entityTransferStateMachine.ResetFromTransit(remoteClient.AgentId); | ||
1001 | } | ||
1002 | |||
1003 | public bool Cross(ScenePresence agent, bool isFlying) | 997 | public bool Cross(ScenePresence agent, bool isFlying) |
1004 | { | 998 | { |
1005 | uint x; | 999 | uint x; |