diff options
author | Teravus Ovares (Dan Olivares) | 2009-11-25 14:13:51 -0500 |
---|---|---|
committer | Teravus Ovares (Dan Olivares) | 2009-11-25 14:13:51 -0500 |
commit | dac9c6fb2360fd46603e08877d57a704eb02e183 (patch) | |
tree | 614ef8a4851d69a3fb3a76c7839ef576c234b6e7 /OpenSim/Region/ScriptEngine/Shared/Api/Implementation | |
parent | Patch: Fix a bug in LAND animation when the TickCount wraps into negative num... (diff) | |
parent | Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim (diff) | |
download | opensim-SC-dac9c6fb2360fd46603e08877d57a704eb02e183.zip opensim-SC-dac9c6fb2360fd46603e08877d57a704eb02e183.tar.gz opensim-SC-dac9c6fb2360fd46603e08877d57a704eb02e183.tar.bz2 opensim-SC-dac9c6fb2360fd46603e08877d57a704eb02e183.tar.xz |
Merge branch 'master' of ssh://MyConnection/var/git/opensim
Diffstat (limited to 'OpenSim/Region/ScriptEngine/Shared/Api/Implementation')
-rw-r--r-- | OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs index 7fdbac8..e72fa70 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs | |||
@@ -636,13 +636,13 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
636 | } | 636 | } |
637 | 637 | ||
638 | // Teleport functions | 638 | // Teleport functions |
639 | public void osTeleportAgent(string agent, uint regionX, uint regionY, LSL_Types.Vector3 position, LSL_Types.Vector3 lookat) | 639 | public void osTeleportAgent(string agent, int regionX, int regionY, LSL_Types.Vector3 position, LSL_Types.Vector3 lookat) |
640 | { | 640 | { |
641 | // High because there is no security check. High griefer potential | 641 | // High because there is no security check. High griefer potential |
642 | // | 642 | // |
643 | CheckThreatLevel(ThreatLevel.High, "osTeleportAgent"); | 643 | CheckThreatLevel(ThreatLevel.High, "osTeleportAgent"); |
644 | 644 | ||
645 | ulong regionHandle = Util.UIntsToLong((regionX * (uint)Constants.RegionSize), (regionY * (uint)Constants.RegionSize)); | 645 | ulong regionHandle = Util.UIntsToLong(((uint)regionX * (uint)Constants.RegionSize), ((uint)regionY * (uint)Constants.RegionSize)); |
646 | 646 | ||
647 | m_host.AddScriptLPS(1); | 647 | m_host.AddScriptLPS(1); |
648 | UUID agentId = new UUID(); | 648 | UUID agentId = new UUID(); |