OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

some shortcuts on local osTeleport, reduce its time penalty, do it with script thread

0.9.0-post-fixes
UbitUmarov 2017-06-26 00:18:46 +01:00
parent 3ce909528d
commit 0418542344
2 changed files with 79 additions and 67 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
OpenSim/Region/Framework/Scenes/Scene.cs
View File

@ -4824,16 +4824,34 @@ Label_GroupsDone:
public void RequestTeleportLocation(IClientAPI remoteClient, string regionName, Vector3 position, public void RequestTeleportLocation(IClientAPI remoteClient, string regionName, Vector3 position,
Vector3 lookat, uint teleportFlags) Vector3 lookat, uint teleportFlags)
{ {
GridRegion region = GridService.GetRegionByName(RegionInfo.ScopeID, regionName); if (EntityTransferModule == null)
{
m_log.DebugFormat("[SCENE]: Unable to perform teleports: no AgentTransferModule is active");
return;
}
if (region == null) ScenePresence sp = GetScenePresence(remoteClient.AgentId);
if (sp == null || sp.IsDeleted || sp.IsInTransit)
return;
ulong regionHandle = 0;
if(regionName == RegionInfo.RegionName)
regionHandle = RegionInfo.RegionHandle;
else
{
GridRegion region = GridService.GetRegionByName(RegionInfo.ScopeID, regionName);
if (region != null)
regionHandle = region.RegionHandle;
}
if(regionHandle == 0)
{ {
// can't find the region: Tell viewer and abort // can't find the region: Tell viewer and abort
remoteClient.SendTeleportFailed("The region '" + regionName + "' could not be found."); remoteClient.SendTeleportFailed("The region '" + regionName + "' could not be found.");
return; return;
} }
RequestTeleportLocation(remoteClient, region.RegionHandle, position, lookat, teleportFlags); EntityTransferModule.Teleport(sp, regionHandle, position, lookat, teleportFlags);
} }
/// <summary> /// <summary>
@ -4847,19 +4865,17 @@ Label_GroupsDone:
public void RequestTeleportLocation(IClientAPI remoteClient, ulong regionHandle, Vector3 position, public void RequestTeleportLocation(IClientAPI remoteClient, ulong regionHandle, Vector3 position,
Vector3 lookAt, uint teleportFlags) Vector3 lookAt, uint teleportFlags)
{ {
ScenePresence sp = GetScenePresence(remoteClient.AgentId); if (EntityTransferModule == null)
if (sp != null)
{ {
if (EntityTransferModule != null) m_log.DebugFormat("[SCENE]: Unable to perform teleports: no AgentTransferModule is active");
{ return;
EntityTransferModule.Teleport(sp, regionHandle, position, lookAt, teleportFlags);
}
else
{
m_log.DebugFormat("[SCENE]: Unable to perform teleports: no AgentTransferModule is active");
sp.ControllingClient.SendTeleportFailed("Unable to perform teleports on this simulator.");
}
} }
ScenePresence sp = GetScenePresence(remoteClient.AgentId);
if (sp == null || sp.IsDeleted || sp.IsInTransit)
return;
EntityTransferModule.Teleport(sp, regionHandle, position, lookAt, teleportFlags);
} }
public bool CrossAgentToNewRegion(ScenePresence agent, bool isFlying) public bool CrossAgentToNewRegion(ScenePresence agent, bool isFlying)

102
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs
View File

@ -859,41 +859,40 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
// //
CheckThreatLevel(ThreatLevel.Severe, "osTeleportAgent"); CheckThreatLevel(ThreatLevel.Severe, "osTeleportAgent");
TeleportAgent(agent, regionName, position, lookat, false); TeleportAgent(agent, regionName, position, lookat);
} }
private void TeleportAgent(string agent, string regionName, private void TeleportAgent(string agent, string regionName,
LSL_Types.Vector3 position, LSL_Types.Vector3 lookat, bool relaxRestrictions) LSL_Types.Vector3 position, LSL_Types.Vector3 lookat)
{ {
m_host.AddScriptLPS(1); m_host.AddScriptLPS(1);
UUID agentId = new UUID(); if(String.IsNullOrWhiteSpace(regionName))
return;
UUID agentId;
if (UUID.TryParse(agent, out agentId)) if (UUID.TryParse(agent, out agentId))
{ {
ScenePresence presence = World.GetScenePresence(agentId); ScenePresence presence = World.GetScenePresence(agentId);
if (presence != null) if (presence == null || presence.IsDeleted || presence.IsInTransit)
return;
if(regionName == World.RegionInfo.RegionName)
{ {
// For osTeleportAgent, agent must be over owners land to avoid abuse // should be faster than going to threadpool
// For osTeleportOwner, this restriction isn't necessary World.RequestTeleportLocation(presence.ControllingClient, regionName, position,
lookat, (uint)TPFlags.ViaLocation);
// commented out because its redundant and uneeded please remove eventually. ScriptSleep(500);
// if (relaxRestrictions || }
// m_host.OwnerID else
// == World.LandChannel.GetLandObject( {
// presence.AbsolutePosition.X, presence.AbsolutePosition.Y).LandData.OwnerID) // We will launch the teleport on a new thread so that when the script threads are terminated
// { // before teleport in ScriptInstance.GetXMLState(), we don't end up aborting the one doing the teleporting.
Util.FireAndForget(
// We will launch the teleport on a new thread so that when the script threads are terminated o => World.RequestTeleportLocation(
// before teleport in ScriptInstance.GetXMLState(), we don't end up aborting the one doing the teleporting. presence.ControllingClient, regionName, position,
Util.FireAndForget( lookat, (uint)TPFlags.ViaLocation),
o => World.RequestTeleportLocation( null, "OSSL_Api.TeleportAgentByRegionCoords");
presence.ControllingClient, regionName, position, ScriptSleep(5000);
lookat, (uint)TPFlags.ViaLocation),
null, "OSSL_Api.TeleportAgentByRegionCoords");
ScriptSleep(5000);
// }
} }
} }
} }
@ -913,41 +912,38 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
ulong regionHandle = Util.RegionGridLocToHandle((uint)regionGridX, (uint)regionGridY); ulong regionHandle = Util.RegionGridLocToHandle((uint)regionGridX, (uint)regionGridY);
m_host.AddScriptLPS(1); m_host.AddScriptLPS(1);
UUID agentId = new UUID(); UUID agentId;
if (UUID.TryParse(agent, out agentId)) if (UUID.TryParse(agent, out agentId))
{ {
ScenePresence presence = World.GetScenePresence(agentId); ScenePresence presence = World.GetScenePresence(agentId);
if (presence != null) if (presence == null || presence.IsDeleted || presence.IsInTransit)
{ return;
// For osTeleportAgent, agent must be over owners land to avoid abuse
// For osTeleportOwner, this restriction isn't necessary
// commented out because its redundant and uneeded please remove eventually. Util.FireAndForget(
// if (relaxRestrictions || o => World.RequestTeleportLocation(
// m_host.OwnerID presence.ControllingClient, regionHandle,
// == World.LandChannel.GetLandObject( position, lookat, (uint)TPFlags.ViaLocation),
// presence.AbsolutePosition.X, presence.AbsolutePosition.Y).LandData.OwnerID) null, "OSSL_Api.TeleportAgentByRegionName");
// {
// We will launch the teleport on a new thread so that when the script threads are terminated ScriptSleep(5000);
// before teleport in ScriptInstance.GetXMLState(), we don't end up aborting the one doing the teleporting.
Util.FireAndForget(
o => World.RequestTeleportLocation(
presence.ControllingClient, regionHandle,
position, lookat, (uint)TPFlags.ViaLocation),
null, "OSSL_Api.TeleportAgentByRegionName");
ScriptSleep(5000);
// }
}
} }
} }
public void osTeleportAgent(string agent, LSL_Types.Vector3 position, LSL_Types.Vector3 lookat) public void osTeleportAgent(string agent, LSL_Types.Vector3 position, LSL_Types.Vector3 lookat)
{ {
osTeleportAgent(agent, World.RegionInfo.RegionName, position, lookat); m_host.AddScriptLPS(1);
UUID agentId;
if (UUID.TryParse(agent, out agentId))
{
ScenePresence presence = World.GetScenePresence(agentId);
if (presence == null || presence.IsDeleted || presence.IsInTransit)
return;
World.RequestTeleportLocation(presence.ControllingClient, World.RegionInfo.RegionName, position,
lookat, (uint)TPFlags.ViaLocation);
ScriptSleep(500);
}
} }
public void osTeleportOwner(string regionName, LSL_Types.Vector3 position, LSL_Types.Vector3 lookat) public void osTeleportOwner(string regionName, LSL_Types.Vector3 position, LSL_Types.Vector3 lookat)
@ -955,12 +951,12 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
// Threat level None because this is what can already be done with the World Map in the viewer // Threat level None because this is what can already be done with the World Map in the viewer
CheckThreatLevel(ThreatLevel.None, "osTeleportOwner"); CheckThreatLevel(ThreatLevel.None, "osTeleportOwner");
TeleportAgent(m_host.OwnerID.ToString(), regionName, position, lookat, true); TeleportAgent(m_host.OwnerID.ToString(), regionName, position, lookat);
} }
public void osTeleportOwner(LSL_Types.Vector3 position, LSL_Types.Vector3 lookat) public void osTeleportOwner(LSL_Types.Vector3 position, LSL_Types.Vector3 lookat)
{ {
osTeleportOwner(World.RegionInfo.RegionName, position, lookat); osTeleportAgent(m_host.OwnerID.ToString(), position, lookat);
} }
public void osTeleportOwner(int regionGridX, int regionGridY, LSL_Types.Vector3 position, LSL_Types.Vector3 lookat) public void osTeleportOwner(int regionGridX, int regionGridY, LSL_Types.Vector3 position, LSL_Types.Vector3 lookat)