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

Merge branch 'master' into careminster

avinationmerge
Melanie 2012-01-15 14:40:33 +00:00
parent 4cbf8d728e 43173f1b0d
commit 9447b6d15f
1 changed files with 24 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -748,7 +748,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
{ {
// High because there is no security check. High griefer potential // High because there is no security check. High griefer potential
// //
CheckThreatLevel(ThreatLevel.High, "osTeleportAgent"); CheckThreatLevel(ThreatLevel.Severe, "osTeleportAgent");
TeleportAgent(agent, regionName, position, lookat, false); TeleportAgent(agent, regionName, position, lookat, false);
} }
@ -765,11 +765,14 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
{ {
// For osTeleportAgent, agent must be over owners land to avoid abuse // For osTeleportAgent, agent must be over owners land to avoid abuse
// For osTeleportOwner, this restriction isn't necessary // For osTeleportOwner, this restriction isn't necessary
if (relaxRestrictions ||
m_host.OwnerID // commented out because its redundant and uneeded please remove eventually.
== World.LandChannel.GetLandObject( // if (relaxRestrictions ||
presence.AbsolutePosition.X, presence.AbsolutePosition.Y).LandData.OwnerID) // m_host.OwnerID
{ // == 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 // 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. // before teleport in ScriptInstance.GetXMLState(), we don't end up aborting the one doing the teleporting.
Util.FireAndForget( Util.FireAndForget(
@ -778,7 +781,9 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
new Vector3((float)lookat.x, (float)lookat.y, (float)lookat.z), (uint)TPFlags.ViaLocation)); new Vector3((float)lookat.x, (float)lookat.y, (float)lookat.z), (uint)TPFlags.ViaLocation));
ScriptSleep(5000); ScriptSleep(5000);
}
// }
} }
} }
} }
@ -787,7 +792,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
{ {
// High because there is no security check. High griefer potential // High because there is no security check. High griefer potential
// //
CheckThreatLevel(ThreatLevel.High, "osTeleportAgent"); CheckThreatLevel(ThreatLevel.Severe, "osTeleportAgent");
TeleportAgent(agent, regionX, regionY, position, lookat, false); TeleportAgent(agent, regionX, regionY, position, lookat, false);
} }
@ -806,11 +811,14 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
{ {
// For osTeleportAgent, agent must be over owners land to avoid abuse // For osTeleportAgent, agent must be over owners land to avoid abuse
// For osTeleportOwner, this restriction isn't necessary // For osTeleportOwner, this restriction isn't necessary
if (relaxRestrictions ||
m_host.OwnerID // commented out because its redundant and uneeded please remove eventually.
== World.LandChannel.GetLandObject( // if (relaxRestrictions ||
presence.AbsolutePosition.X, presence.AbsolutePosition.Y).LandData.OwnerID) // m_host.OwnerID
{ // == 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 // 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. // before teleport in ScriptInstance.GetXMLState(), we don't end up aborting the one doing the teleporting.
Util.FireAndForget( Util.FireAndForget(
@ -819,7 +827,9 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
new Vector3((float)lookat.x, (float)lookat.y, (float)lookat.z), (uint)TPFlags.ViaLocation)); new Vector3((float)lookat.x, (float)lookat.y, (float)lookat.z), (uint)TPFlags.ViaLocation));
ScriptSleep(5000); ScriptSleep(5000);
}
// }
} }
} }
} }