diff options
author | Melanie | 2009-11-25 17:01:41 +0000 |
---|---|---|
committer | Melanie | 2009-11-25 17:02:45 +0000 |
commit | 0b380f68d81267550b5adf45e16378e4648df933 (patch) | |
tree | 4db93438c9bf24e023d61284e6b104ba765d12dc | |
parent | Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim (diff) | |
download | opensim-SC-0b380f68d81267550b5adf45e16378e4648df933.zip opensim-SC-0b380f68d81267550b5adf45e16378e4648df933.tar.gz opensim-SC-0b380f68d81267550b5adf45e16378e4648df933.tar.bz2 opensim-SC-0b380f68d81267550b5adf45e16378e4648df933.tar.xz |
Change osTeleportAgent parameters from long to int. That numerical range is
not even supported by the underlying type, so there is no need to ask
for a type the script can not even supply.
3 files changed, 5 insertions, 5 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(); |
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Interface/IOSSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Interface/IOSSL_Api.cs index 2a403bf..470946a 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Api/Interface/IOSSL_Api.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Api/Interface/IOSSL_Api.cs | |||
@@ -83,7 +83,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api.Interfaces | |||
83 | 83 | ||
84 | // Teleport commands | 84 | // Teleport commands |
85 | void osTeleportAgent(string agent, string regionName, LSL_Types.Vector3 position, LSL_Types.Vector3 lookat); | 85 | void osTeleportAgent(string agent, string regionName, LSL_Types.Vector3 position, LSL_Types.Vector3 lookat); |
86 | void osTeleportAgent(string agent, uint regionX, uint regionY, LSL_Types.Vector3 position, LSL_Types.Vector3 lookat); | 86 | void osTeleportAgent(string agent, int regionX, int regionY, LSL_Types.Vector3 position, LSL_Types.Vector3 lookat); |
87 | void osTeleportAgent(string agent, LSL_Types.Vector3 position, LSL_Types.Vector3 lookat); | 87 | void osTeleportAgent(string agent, LSL_Types.Vector3 position, LSL_Types.Vector3 lookat); |
88 | 88 | ||
89 | // Animation commands | 89 | // Animation commands |
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/OSSL_Stub.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/OSSL_Stub.cs index 4928e90..6b88834 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/OSSL_Stub.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/OSSL_Stub.cs | |||
@@ -201,9 +201,9 @@ namespace OpenSim.Region.ScriptEngine.Shared.ScriptBase | |||
201 | m_OSSL_Functions.osTeleportAgent(agent, regionName, position, lookat); | 201 | m_OSSL_Functions.osTeleportAgent(agent, regionName, position, lookat); |
202 | } | 202 | } |
203 | 203 | ||
204 | public void osTeleportAgent(string agent, long regionX, long regionY, vector position, vector lookat) | 204 | public void osTeleportAgent(string agent, int regionX, int regionY, vector position, vector lookat) |
205 | { | 205 | { |
206 | m_OSSL_Functions.osTeleportAgent(agent, (uint) regionX, (uint) regionY, position, lookat); | 206 | m_OSSL_Functions.osTeleportAgent(agent, regionX, regionY, position, lookat); |
207 | } | 207 | } |
208 | 208 | ||
209 | public void osTeleportAgent(string agent, vector position, vector lookat) | 209 | public void osTeleportAgent(string agent, vector position, vector lookat) |