1 files changed, 2 insertions, 1 deletions

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);
                             }
 
                         }