aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/ScriptEngine
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim/Region/ScriptEngine')
-rw-r--r--OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs4
-rw-r--r--OpenSim/Region/ScriptEngine/Shared/Api/Runtime/OSSL_Stub.cs9
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 fd4ba71..5c6996f 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs
@@ -298,7 +298,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
298 CheckThreatLevel(ThreatLevel.High, "osTerrainSetHeight"); 298 CheckThreatLevel(ThreatLevel.High, "osTerrainSetHeight");
299 299
300 m_host.AddScriptLPS(1); 300 m_host.AddScriptLPS(1);
301 if (x > 255 || x < 0 || y > 255 || y < 0) 301 if (x > ((int)Constants.RegionSize - 1) || x < 0 || y > ((int)Constants.RegionSize - 1) || y < 0)
302 OSSLError("osTerrainSetHeight: Coordinate out of bounds"); 302 OSSLError("osTerrainSetHeight: Coordinate out of bounds");
303 303
304 if (World.Permissions.CanTerraformLand(m_host.OwnerID, new Vector3(x, y, 0))) 304 if (World.Permissions.CanTerraformLand(m_host.OwnerID, new Vector3(x, y, 0)))
@@ -317,7 +317,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
317 CheckThreatLevel(ThreatLevel.None, "osTerrainGetHeight"); 317 CheckThreatLevel(ThreatLevel.None, "osTerrainGetHeight");
318 318
319 m_host.AddScriptLPS(1); 319 m_host.AddScriptLPS(1);
320 if (x > 255 || x < 0 || y > 255 || y < 0) 320 if (x > ((int)Constants.RegionSize - 1) || x < 0 || y > ((int)Constants.RegionSize - 1) || y < 0)
321 OSSLError("osTerrainGetHeight: Coordinate out of bounds"); 321 OSSLError("osTerrainGetHeight: Coordinate out of bounds");
322 322
323 return World.Heightmap[x, y]; 323 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;
31using System.Reflection; 31using System.Reflection;
32using System.Collections; 32using System.Collections;
33using System.Collections.Generic; 33using System.Collections.Generic;
34using OpenSim.Framework;
34using OpenSim.Region.Framework.Interfaces; 35using OpenSim.Region.Framework.Interfaces;
35using OpenSim.Region.ScriptEngine.Interfaces; 36using OpenSim.Region.ScriptEngine.Interfaces;
36using OpenSim.Region.ScriptEngine.Shared.Api.Interfaces; 37using 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)