a few changes to tp home

1 files changed, 10 insertions, 12 deletions

diff --git a/OpenSim/Region/CoreModules/World/Estate/EstateModule.cs b/OpenSim/Region/CoreModules/World/Estate/EstateModule.cs
index f3c8aa8..f4a174a 100644
--- a/OpenSim/Region/CoreModules/World/Estate/EstateModule.cs
+++ b/OpenSim/Region/CoreModules/World/Estate/EstateModule.cs
@@ -225,13 +225,10 @@ namespace OpenSim.Region.CoreModules.World.Estate
                     continue;
 
                 ScenePresence p = scene.GetScenePresence(prey);
-                if (p != null && !p.IsChildAgent )
+                if (p != null && !p.IsChildAgent && !p.IsDeleted && !p.IsInTransit)
                 {
-                    if(!p.IsDeleted && !p.IsInTransit)
-                    {
-                        p.ControllingClient.SendTeleportStart(16);
-                        scene.TeleportClientHome(prey, p.ControllingClient);
-                    }
+                    p.ControllingClient.SendTeleportStart(16);
+                    scene.TeleportClientHome(prey, client);
                     return;
                 }
             }
@@ -256,13 +253,14 @@ namespace OpenSim.Region.CoreModules.World.Estate
                 if (s.RegionInfo.EstateSettings.EstateID != estateID)
                     continue;
 
-                scene.ForEachScenePresence(delegate(ScenePresence p) {
-                    if (p != null && !p.IsChildAgent)
+                scene.ForEachScenePresence(delegate(ScenePresence p)
                     {
-                        p.ControllingClient.SendTeleportStart(16);
-                        scene.TeleportClientHome(p.ControllingClient.AgentId, p.ControllingClient);
-                    }
-                });
+                        if (p != null && !p.IsChildAgent && !p.IsDeleted && !p.IsInTransit)
+                        {
+                            p.ControllingClient.SendTeleportStart(16);
+                            scene.TeleportClientHome(p.ControllingClient.AgentId, client);
+                        }
+                    });
             }
 
             m_EstateConnector.SendTeleportHomeAllUsers(estateID);