aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim/Region')
-rw-r--r--OpenSim/Region/ScriptEngine/DotNetEngine/Compiler/Server_API/LSL_BuiltIn_Commands.cs11
-rw-r--r--OpenSim/Region/Terrain.BasicTerrain/TerrainEngine.cs15
2 files changed, 26 insertions, 0 deletions
diff --git a/OpenSim/Region/ScriptEngine/DotNetEngine/Compiler/Server_API/LSL_BuiltIn_Commands.cs b/OpenSim/Region/ScriptEngine/DotNetEngine/Compiler/Server_API/LSL_BuiltIn_Commands.cs
index fb521df..14f66e8 100644
--- a/OpenSim/Region/ScriptEngine/DotNetEngine/Compiler/Server_API/LSL_BuiltIn_Commands.cs
+++ b/OpenSim/Region/ScriptEngine/DotNetEngine/Compiler/Server_API/LSL_BuiltIn_Commands.cs
@@ -2876,6 +2876,17 @@ namespace OpenSim.Region.ScriptEngine.DotNetEngine.Compiler
2876 // 2876 //
2877 // OpenSim functions 2877 // OpenSim functions
2878 // 2878 //
2879 public int osTerrainSetHeight(int x, int y, double val)
2880 {
2881 World.Terrain.Set(x, y, val);
2882 return 1;
2883 }
2884
2885 public double osTerrainGetHeight(int x, int y)
2886 {
2887 return World.Terrain.GetHeight(x, y);
2888 }
2889
2879 public string osSetDynamicTextureURL(string dynamicID, string contentType, string url, string extraParams, 2890 public string osSetDynamicTextureURL(string dynamicID, string contentType, string url, string extraParams,
2880 int timer) 2891 int timer)
2881 { 2892 {
diff --git a/OpenSim/Region/Terrain.BasicTerrain/TerrainEngine.cs b/OpenSim/Region/Terrain.BasicTerrain/TerrainEngine.cs
index f29f42a..e89ff62 100644
--- a/OpenSim/Region/Terrain.BasicTerrain/TerrainEngine.cs
+++ b/OpenSim/Region/Terrain.BasicTerrain/TerrainEngine.cs
@@ -1122,6 +1122,21 @@ namespace OpenSim.Region.Terrain
1122 } 1122 }
1123 1123
1124 /// <summary> 1124 /// <summary>
1125 /// Sets a particular heightmap point to a specified value
1126 /// </summary>
1127 /// <param name="x">X Coordinate</param>
1128 /// <param name="y">Y Coordinate</param>
1129 /// <param name="val">Value</param>
1130 public void Set(int x, int y, double val)
1131 {
1132 lock (heightmap)
1133 {
1134 heightmap.Set(x, y, val);
1135 }
1136 tainted++;
1137 }
1138
1139 /// <summary>
1125 /// Raises land in a sphere around the specified coordinates 1140 /// Raises land in a sphere around the specified coordinates
1126 /// </summary> 1141 /// </summary>
1127 /// <param name="rx">Center of the sphere on the X axis</param> 1142 /// <param name="rx">Center of the sphere on the X axis</param>