* Apply patch in http://opensimulator.org/mantis/view.php?id=2397
* Fix from 7139 also needed in the Estate Menu teleport home functions * Thanks idb0.6.0-stable
parent
c93c42cd49
commit
2184f4b2a9
|
@ -263,7 +263,10 @@ namespace OpenSim.Region.Environment.Modules.World.Estate
|
||||||
if (s != null)
|
if (s != null)
|
||||||
{
|
{
|
||||||
if (!s.IsChildAgent)
|
if (!s.IsChildAgent)
|
||||||
|
{
|
||||||
|
s.ControllingClient.SendTeleportLocationStart();
|
||||||
m_scene.TeleportClientHome(user, s.ControllingClient);
|
m_scene.TeleportClientHome(user, s.ControllingClient);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
@ -389,6 +392,7 @@ namespace OpenSim.Region.Environment.Modules.World.Estate
|
||||||
ScenePresence s = m_scene.GetScenePresence(prey);
|
ScenePresence s = m_scene.GetScenePresence(prey);
|
||||||
if (s != null)
|
if (s != null)
|
||||||
{
|
{
|
||||||
|
s.ControllingClient.SendTeleportLocationStart();
|
||||||
m_scene.TeleportClientHome(prey, s.ControllingClient);
|
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
|
// Also make sure they are actually in the region
|
||||||
if (!s.IsChildAgent)
|
if (!s.IsChildAgent)
|
||||||
{
|
{
|
||||||
|
s.ControllingClient.SendTeleportLocationStart();
|
||||||
m_scene.TeleportClientHome(s.UUID, s.ControllingClient);
|
m_scene.TeleportClientHome(s.UUID, s.ControllingClient);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue