From 93ff27053a2d46a934bb6a1780ccfecd505ab44f Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Thu, 24 May 2012 22:59:52 +0100
Subject: 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
---
 .../Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'OpenSim/Region')

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
                 m_log.DebugFormat(
                     "[ENTITY TRANSFER MODULE]: Ignoring within region teleport request of {0} {1} to {2} - agent is already in transit.",
                     sp.Name, sp.UUID, position);
+
+                return;
             }
 
             // Teleport within the same region
-- 
cgit v1.1