From 9f2f3afe22b28d8ff56f45148914eb8b9d933443 Mon Sep 17 00:00:00 2001
From: Teravus Ovares (Dan Olivares)
Date: Sun, 30 Aug 2009 02:49:50 -0400
Subject: * Fixes a teleport issue when teleporting out of a region to a
 different one.

---
 OpenSim/Region/Framework/Scenes/Scene.cs | 6 ++++++
 1 file changed, 6 insertions(+)

(limited to 'OpenSim/Region/Framework/Scenes')

diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs
index 9255d36..b8c8f32 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.cs
@@ -3377,6 +3377,12 @@ namespace OpenSim.Region.Framework.Scenes
 
                 if (!result)
                     regionHandle = m_regInfo.RegionHandle;
+                else
+                {
+                    // not in this region, undo the shift!
+                    position.X -= shiftx;
+                    position.Y -= shifty;
+                }
 
                 if (m_teleportModule != null)
                 {
-- 
cgit v1.1