aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/ScriptEngine
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs12
1 files changed, 6 insertions, 6 deletions
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs
index 319f14c..e525a2e 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs
@@ -852,19 +852,19 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
852 } 852 }
853 } 853 }
854 854
855 public void osTeleportAgent(string agent, int regionX, int regionY, LSL_Types.Vector3 position, LSL_Types.Vector3 lookat) 855 public void osTeleportAgent(string agent, int regionGridX, int regionGridY, LSL_Types.Vector3 position, LSL_Types.Vector3 lookat)
856 { 856 {
857 // High because there is no security check. High griefer potential 857 // High because there is no security check. High griefer potential
858 // 858 //
859 CheckThreatLevel(ThreatLevel.Severe, "osTeleportAgent"); 859 CheckThreatLevel(ThreatLevel.Severe, "osTeleportAgent");
860 860
861 TeleportAgent(agent, regionX, regionY, position, lookat, false); 861 TeleportAgent(agent, regionGridX, regionGridY, position, lookat, false);
862 } 862 }
863 863
864 private void TeleportAgent(string agent, int regionX, int regionY, 864 private void TeleportAgent(string agent, int regionGridX, int regionGridY,
865 LSL_Types.Vector3 position, LSL_Types.Vector3 lookat, bool relaxRestrictions) 865 LSL_Types.Vector3 position, LSL_Types.Vector3 lookat, bool relaxRestrictions)
866 { 866 {
867 ulong regionHandle = Util.RegionLocToHandle((uint)regionX, (uint)regionY); 867 ulong regionHandle = Util.RegionGridLocToHandle((uint)regionGridX, (uint)regionGridY);
868 868
869 m_host.AddScriptLPS(1); 869 m_host.AddScriptLPS(1);
870 UUID agentId = new UUID(); 870 UUID agentId = new UUID();
@@ -917,11 +917,11 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
917 osTeleportOwner(World.RegionInfo.RegionName, position, lookat); 917 osTeleportOwner(World.RegionInfo.RegionName, position, lookat);
918 } 918 }
919 919
920 public void osTeleportOwner(int regionX, int regionY, LSL_Types.Vector3 position, LSL_Types.Vector3 lookat) 920 public void osTeleportOwner(int regionGridX, int regionGridY, LSL_Types.Vector3 position, LSL_Types.Vector3 lookat)
921 { 921 {
922 CheckThreatLevel(ThreatLevel.None, "osTeleportOwner"); 922 CheckThreatLevel(ThreatLevel.None, "osTeleportOwner");
923 923
924 TeleportAgent(m_host.OwnerID.ToString(), regionX, regionY, position, lookat, true); 924 TeleportAgent(m_host.OwnerID.ToString(), regionGridX, regionGridY, position, lookat, true);
925 } 925 }
926 926
927 ///<summary> 927 ///<summary>