diff options
Diffstat (limited to 'OpenSim/Region/ScriptEngine/Shared')
-rw-r--r-- | OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs | 38 |
1 files changed, 24 insertions, 14 deletions
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs index c343e93..ca340c6 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs | |||
@@ -748,7 +748,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
748 | { | 748 | { |
749 | // High because there is no security check. High griefer potential | 749 | // High because there is no security check. High griefer potential |
750 | // | 750 | // |
751 | CheckThreatLevel(ThreatLevel.High, "osTeleportAgent"); | 751 | CheckThreatLevel(ThreatLevel.Severe, "osTeleportAgent"); |
752 | 752 | ||
753 | TeleportAgent(agent, regionName, position, lookat, false); | 753 | TeleportAgent(agent, regionName, position, lookat, false); |
754 | } | 754 | } |
@@ -765,11 +765,14 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
765 | { | 765 | { |
766 | // For osTeleportAgent, agent must be over owners land to avoid abuse | 766 | // For osTeleportAgent, agent must be over owners land to avoid abuse |
767 | // For osTeleportOwner, this restriction isn't necessary | 767 | // For osTeleportOwner, this restriction isn't necessary |
768 | if (relaxRestrictions || | 768 | |
769 | m_host.OwnerID | 769 | // commented out because its redundant and uneeded please remove eventually. |
770 | == World.LandChannel.GetLandObject( | 770 | // if (relaxRestrictions || |
771 | presence.AbsolutePosition.X, presence.AbsolutePosition.Y).LandData.OwnerID) | 771 | // m_host.OwnerID |
772 | { | 772 | // == World.LandChannel.GetLandObject( |
773 | // presence.AbsolutePosition.X, presence.AbsolutePosition.Y).LandData.OwnerID) | ||
774 | // { | ||
775 | |||
773 | // We will launch the teleport on a new thread so that when the script threads are terminated | 776 | // We will launch the teleport on a new thread so that when the script threads are terminated |
774 | // before teleport in ScriptInstance.GetXMLState(), we don't end up aborting the one doing the teleporting. | 777 | // before teleport in ScriptInstance.GetXMLState(), we don't end up aborting the one doing the teleporting. |
775 | Util.FireAndForget( | 778 | Util.FireAndForget( |
@@ -778,7 +781,9 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
778 | new Vector3((float)lookat.x, (float)lookat.y, (float)lookat.z), (uint)TPFlags.ViaLocation)); | 781 | new Vector3((float)lookat.x, (float)lookat.y, (float)lookat.z), (uint)TPFlags.ViaLocation)); |
779 | 782 | ||
780 | ScriptSleep(5000); | 783 | ScriptSleep(5000); |
781 | } | 784 | |
785 | // } | ||
786 | |||
782 | } | 787 | } |
783 | } | 788 | } |
784 | } | 789 | } |
@@ -787,7 +792,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
787 | { | 792 | { |
788 | // High because there is no security check. High griefer potential | 793 | // High because there is no security check. High griefer potential |
789 | // | 794 | // |
790 | CheckThreatLevel(ThreatLevel.High, "osTeleportAgent"); | 795 | CheckThreatLevel(ThreatLevel.Severe, "osTeleportAgent"); |
791 | 796 | ||
792 | TeleportAgent(agent, regionX, regionY, position, lookat, false); | 797 | TeleportAgent(agent, regionX, regionY, position, lookat, false); |
793 | } | 798 | } |
@@ -806,11 +811,14 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
806 | { | 811 | { |
807 | // For osTeleportAgent, agent must be over owners land to avoid abuse | 812 | // For osTeleportAgent, agent must be over owners land to avoid abuse |
808 | // For osTeleportOwner, this restriction isn't necessary | 813 | // For osTeleportOwner, this restriction isn't necessary |
809 | if (relaxRestrictions || | 814 | |
810 | m_host.OwnerID | 815 | // commented out because its redundant and uneeded please remove eventually. |
811 | == World.LandChannel.GetLandObject( | 816 | // if (relaxRestrictions || |
812 | presence.AbsolutePosition.X, presence.AbsolutePosition.Y).LandData.OwnerID) | 817 | // m_host.OwnerID |
813 | { | 818 | // == World.LandChannel.GetLandObject( |
819 | // presence.AbsolutePosition.X, presence.AbsolutePosition.Y).LandData.OwnerID) | ||
820 | // { | ||
821 | |||
814 | // We will launch the teleport on a new thread so that when the script threads are terminated | 822 | // We will launch the teleport on a new thread so that when the script threads are terminated |
815 | // before teleport in ScriptInstance.GetXMLState(), we don't end up aborting the one doing the teleporting. | 823 | // before teleport in ScriptInstance.GetXMLState(), we don't end up aborting the one doing the teleporting. |
816 | Util.FireAndForget( | 824 | Util.FireAndForget( |
@@ -819,7 +827,9 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
819 | new Vector3((float)lookat.x, (float)lookat.y, (float)lookat.z), (uint)TPFlags.ViaLocation)); | 827 | new Vector3((float)lookat.x, (float)lookat.y, (float)lookat.z), (uint)TPFlags.ViaLocation)); |
820 | 828 | ||
821 | ScriptSleep(5000); | 829 | ScriptSleep(5000); |
822 | } | 830 | |
831 | // } | ||
832 | |||
823 | } | 833 | } |
824 | } | 834 | } |
825 | } | 835 | } |