diff options
| author | Melanie | 2009-08-08 01:43:28 +0100 |
|---|---|---|
| committer | Melanie | 2009-08-08 01:43:28 +0100 |
| commit | 0b0ed200f66bb8ab3c139d85263e7c8e81117791 (patch) | |
| tree | 49af5e09fa54c4ef1d441ebd58ab9c6bf4a242fd /OpenSim/Region/ScriptEngine/Shared/Api/Implementation | |
| parent | Change the default for internal IP address back to 0.0.0.0 (diff) | |
| parent | Merge branch 'master' of ssh://MyConnection/var/git/opensim (diff) | |
| download | opensim-SC-0b0ed200f66bb8ab3c139d85263e7c8e81117791.zip opensim-SC-0b0ed200f66bb8ab3c139d85263e7c8e81117791.tar.gz opensim-SC-0b0ed200f66bb8ab3c139d85263e7c8e81117791.tar.bz2 opensim-SC-0b0ed200f66bb8ab3c139d85263e7c8e81117791.tar.xz | |
Merge branch 'master' of ssh://melanie@opensimulator.org/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 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]; |