diff options
| author | Justin Clark-Casey (justincc) | 2012-05-24 22:59:52 +0100 |
|---|---|---|
| committer | Justin Clark-Casey (justincc) | 2012-05-24 22:59:52 +0100 |
| commit | 93ff27053a2d46a934bb6a1780ccfecd505ab44f (patch) | |
| tree | aad22f73ba4a33d2dc0ce38214ebba8819e12925 /OpenSim | |
| parent | On inter-region teleport, only stand the avatar up if the QueryAccess call to... (diff) | |
| download | opensim-SC_OLD-93ff27053a2d46a934bb6a1780ccfecd505ab44f.zip opensim-SC_OLD-93ff27053a2d46a934bb6a1780ccfecd505ab44f.tar.gz opensim-SC_OLD-93ff27053a2d46a934bb6a1780ccfecd505ab44f.tar.bz2 opensim-SC_OLD-93ff27053a2d46a934bb6a1780ccfecd505ab44f.tar.xz | |
Don't actually proceed on a within-region teleport if another is already taking place, rather than just (falsely) logging that we're not going to proceed.
An oversight from recent commit 9ab0c81
Diffstat (limited to 'OpenSim')
| -rw-r--r-- | OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs b/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs index 5afe553..b5717cd 100644 --- a/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs +++ b/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs | |||
| @@ -227,6 +227,8 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer | |||
| 227 | m_log.DebugFormat( | 227 | m_log.DebugFormat( |
| 228 | "[ENTITY TRANSFER MODULE]: Ignoring within region teleport request of {0} {1} to {2} - agent is already in transit.", | 228 | "[ENTITY TRANSFER MODULE]: Ignoring within region teleport request of {0} {1} to {2} - agent is already in transit.", |
| 229 | sp.Name, sp.UUID, position); | 229 | sp.Name, sp.UUID, position); |
| 230 | |||
| 231 | return; | ||
| 230 | } | 232 | } |
| 231 | 233 | ||
| 232 | // Teleport within the same region | 234 | // Teleport within the same region |