From bbd076544d18961af02ee43b5e0b3f2c3e3c1133 Mon Sep 17 00:00:00 2001
From: Melanie Thielker
Date: Fri, 18 Jul 2008 19:32:05 +0000
Subject: Patch to fix saving of estate managers list loaded during migration.
 No longer teleports an agent home unless their root agent is being banned.
 Visual blocking is still in effect.

---
 .../Region/Environment/Modules/World/Estate/EstateManagementModule.cs  | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'OpenSim/Region/Environment/Modules/World/Estate/EstateManagementModule.cs')

diff --git a/OpenSim/Region/Environment/Modules/World/Estate/EstateManagementModule.cs b/OpenSim/Region/Environment/Modules/World/Estate/EstateManagementModule.cs
index f2b6ae0..ab0adf2 100644
--- a/OpenSim/Region/Environment/Modules/World/Estate/EstateManagementModule.cs
+++ b/OpenSim/Region/Environment/Modules/World/Estate/EstateManagementModule.cs
@@ -245,7 +245,8 @@ namespace OpenSim.Region.Environment.Modules.World.Estate
                             ScenePresence s = m_scene.GetScenePresence(user);
                             if (s != null)
                             {
-                                m_scene.TeleportClientHome(user, s.ControllingClient);
+                                if(!s.IsChildAgent)
+                                    m_scene.TeleportClientHome(user, s.ControllingClient);
                             }
 
                         }
-- 
cgit v1.1