diff options
Diffstat (limited to 'OpenSim/Region/ScriptEngine/Shared/Api')
-rw-r--r-- | OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs | 4 | ||||
-rw-r--r-- | OpenSim/Region/ScriptEngine/Shared/Api/Runtime/OSSL_Stub.cs | 9 |
2 files changed, 7 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 1dd4b19..cbe84ac 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs | |||
@@ -299,7 +299,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
299 | CheckThreatLevel(ThreatLevel.High, "osTerrainSetHeight"); | 299 | CheckThreatLevel(ThreatLevel.High, "osTerrainSetHeight"); |
300 | 300 | ||
301 | m_host.AddScriptLPS(1); | 301 | m_host.AddScriptLPS(1); |
302 | if (x > 255 || x < 0 || y > 255 || y < 0) | 302 | if (x > ((int)Constants.RegionSize - 1) || x < 0 || y > ((int)Constants.RegionSize - 1) || y < 0) |
303 | OSSLError("osTerrainSetHeight: Coordinate out of bounds"); | 303 | OSSLError("osTerrainSetHeight: Coordinate out of bounds"); |
304 | 304 | ||
305 | if (World.Permissions.CanTerraformLand(m_host.OwnerID, new Vector3(x, y, 0))) | 305 | if (World.Permissions.CanTerraformLand(m_host.OwnerID, new Vector3(x, y, 0))) |
@@ -318,7 +318,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
318 | CheckThreatLevel(ThreatLevel.None, "osTerrainGetHeight"); | 318 | CheckThreatLevel(ThreatLevel.None, "osTerrainGetHeight"); |
319 | 319 | ||
320 | m_host.AddScriptLPS(1); | 320 | m_host.AddScriptLPS(1); |
321 | if (x > 255 || x < 0 || y > 255 || y < 0) | 321 | if (x > ((int)Constants.RegionSize - 1) || x < 0 || y > ((int)Constants.RegionSize - 1) || y < 0) |
322 | OSSLError("osTerrainGetHeight: Coordinate out of bounds"); | 322 | OSSLError("osTerrainGetHeight: Coordinate out of bounds"); |
323 | 323 | ||
324 | return World.Heightmap[x, y]; | 324 | return World.Heightmap[x, y]; |
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/OSSL_Stub.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/OSSL_Stub.cs index 2408129..22c8887 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/OSSL_Stub.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/OSSL_Stub.cs | |||
@@ -31,6 +31,7 @@ using System.Threading; | |||
31 | using System.Reflection; | 31 | using System.Reflection; |
32 | using System.Collections; | 32 | using System.Collections; |
33 | using System.Collections.Generic; | 33 | using System.Collections.Generic; |
34 | using OpenSim.Framework; | ||
34 | using OpenSim.Region.Framework.Interfaces; | 35 | using OpenSim.Region.Framework.Interfaces; |
35 | using OpenSim.Region.ScriptEngine.Interfaces; | 36 | using OpenSim.Region.ScriptEngine.Interfaces; |
36 | using OpenSim.Region.ScriptEngine.Shared.Api.Interfaces; | 37 | using OpenSim.Region.ScriptEngine.Shared.Api.Interfaces; |
@@ -443,12 +444,12 @@ namespace OpenSim.Region.ScriptEngine.Shared.ScriptBase | |||
443 | } | 444 | } |
444 | private void Save() | 445 | private void Save() |
445 | { | 446 | { |
446 | if (Position.x > 255) | 447 | if (Position.x > ((int)Constants.RegionSize - 1)) |
447 | Position.x = 255; | 448 | Position.x = ((int)Constants.RegionSize - 1); |
448 | if (Position.x < 0) | 449 | if (Position.x < 0) |
449 | Position.x = 0; | 450 | Position.x = 0; |
450 | if (Position.y > 255) | 451 | if (Position.y > ((int)Constants.RegionSize - 1)) |
451 | Position.y = 255; | 452 | Position.y = ((int)Constants.RegionSize - 1); |
452 | if (Position.y < 0) | 453 | if (Position.y < 0) |
453 | Position.y = 0; | 454 | Position.y = 0; |
454 | if (Position.z > 768) | 455 | if (Position.z > 768) |