diff options
author | Justin Clark-Casey (justincc) | 2013-08-15 14:50:20 +0100 |
---|---|---|
committer | Justin Clark-Casey (justincc) | 2013-08-15 14:51:54 +0100 |
commit | 7c916ab91ccadb8cb9a84508f29fa64f7e2e9e1e (patch) | |
tree | 5e7717ca7b8436873ae0dfc301283c49afa2b973 /OpenSim/Region | |
parent | Move DoNotCloseAfterTeleport flag reset before UpdateAgent in V2 to avoid a l... (diff) | |
download | opensim-SC-7c916ab91ccadb8cb9a84508f29fa64f7e2e9e1e.zip opensim-SC-7c916ab91ccadb8cb9a84508f29fa64f7e2e9e1e.tar.gz opensim-SC-7c916ab91ccadb8cb9a84508f29fa64f7e2e9e1e.tar.bz2 opensim-SC-7c916ab91ccadb8cb9a84508f29fa64f7e2e9e1e.tar.xz |
Try to make "slow down" message that one could receive on rapid teleporting more informative to the user.
This message is seen on V2 if one attempts to quickly re-teleport from a source region where one had previously teleported to a non-neighbour and back within 15 secs.
The solution here is for the user to wait a short while.
This message can also be seen on any teleport protocol if one recieves multiple teleport attempts simultaneously. Probably still useful here to help identify misbehaving scripts.
Diffstat (limited to 'OpenSim/Region')
-rw-r--r-- | OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs b/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs index 4011422..17ebc83 100644 --- a/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs +++ b/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs | |||
@@ -317,7 +317,8 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer | |||
317 | "[ENTITY TRANSFER MODULE]: Ignoring teleport request of {0} {1} to {2}@{3} - agent is already in transit.", | 317 | "[ENTITY TRANSFER MODULE]: Ignoring teleport request of {0} {1} to {2}@{3} - agent is already in transit.", |
318 | sp.Name, sp.UUID, position, regionHandle); | 318 | sp.Name, sp.UUID, position, regionHandle); |
319 | 319 | ||
320 | sp.ControllingClient.SendTeleportFailed("Slow down!"); | 320 | sp.ControllingClient.SendTeleportFailed("Previous teleport process incomplete. Please retry shortly."); |
321 | |||
321 | return; | 322 | return; |
322 | } | 323 | } |
323 | 324 | ||