ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-08-11 20:05:33 +08:00
Code Issues Packages Projects Releases Wiki Activity

a few changes to tp home

Browse Source
This commit is contained in:
UbitUmarov
2019-01-18 22:18:49 +00:00
parent fc075c61ed
commit 796a8efe25
3 changed files with 134 additions and 75 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
OpenSim/Region/CoreModules/World/Estate/EstateModule.cs
View File

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