From 2184f4b2a949354d0b7724fb5d274b36d9418c52 Mon Sep 17 00:00:00 2001 From: Justin Clarke Casey Date: Fri, 7 Nov 2008 16:54:57 +0000 Subject: [PATCH] * Apply patch in http://opensimulator.org/mantis/view.php?id=2397 * Fix from 7139 also needed in the Estate Menu teleport home functions * Thanks idb --- .../Modules/World/Estate/EstateManagementModule.cs | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/OpenSim/Region/Environment/Modules/World/Estate/EstateManagementModule.cs b/OpenSim/Region/Environment/Modules/World/Estate/EstateManagementModule.cs index a8882351dc..041bba5d41 100644 --- a/OpenSim/Region/Environment/Modules/World/Estate/EstateManagementModule.cs +++ b/OpenSim/Region/Environment/Modules/World/Estate/EstateManagementModule.cs @@ -263,7 +263,10 @@ namespace OpenSim.Region.Environment.Modules.World.Estate if (s != null) { if (!s.IsChildAgent) + { + s.ControllingClient.SendTeleportLocationStart(); m_scene.TeleportClientHome(user, s.ControllingClient); + } } } @@ -389,6 +392,7 @@ namespace OpenSim.Region.Environment.Modules.World.Estate ScenePresence s = m_scene.GetScenePresence(prey); if (s != null) { + s.ControllingClient.SendTeleportLocationStart(); m_scene.TeleportClientHome(prey, s.ControllingClient); } } @@ -409,6 +413,7 @@ namespace OpenSim.Region.Environment.Modules.World.Estate // Also make sure they are actually in the region if (!s.IsChildAgent) { + s.ControllingClient.SendTeleportLocationStart(); m_scene.TeleportClientHome(s.UUID, s.ControllingClient); } }