aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--OpenSim.RegionServer/OpenSimMain.cs5
-rw-r--r--OpenSim.Terrain.BasicTerrain/TerrainEngine.cs5
2 files changed, 10 insertions, 0 deletions
diff --git a/OpenSim.RegionServer/OpenSimMain.cs b/OpenSim.RegionServer/OpenSimMain.cs
index 4321d8a..edf4c62 100644
--- a/OpenSim.RegionServer/OpenSimMain.cs
+++ b/OpenSim.RegionServer/OpenSimMain.cs
@@ -541,6 +541,7 @@ namespace OpenSim
541 m_console.WriteLine("terrain load <type> <filename> - loads a terrain from disk, type can be 'F32', 'F64' or 'IMG'"); 541 m_console.WriteLine("terrain load <type> <filename> - loads a terrain from disk, type can be 'F32', 'F64' or 'IMG'");
542 m_console.WriteLine("terrain save <type> <filename> - saves a terrain to disk, type can be 'F32' or 'F64'"); 542 m_console.WriteLine("terrain save <type> <filename> - saves a terrain to disk, type can be 'F32' or 'F64'");
543 m_console.WriteLine("terrain rescale <min> <max> - rescales a terrain to be between <min> and <max> meters high"); 543 m_console.WriteLine("terrain rescale <min> <max> - rescales a terrain to be between <min> and <max> meters high");
544 m_console.WriteLine("terrain multiply <val> - multiplies a terrain by <val>");
544 break; 545 break;
545 546
546 case "seed": 547 case "seed":
@@ -555,6 +556,10 @@ namespace OpenSim
555 LocalWorld.Terrain.setRange(Convert.ToSingle(args[1]), Convert.ToSingle(args[2])); 556 LocalWorld.Terrain.setRange(Convert.ToSingle(args[1]), Convert.ToSingle(args[2]));
556 break; 557 break;
557 558
559 case "multiply":
560 LocalWorld.Terrain *= Convert.ToDouble(args[1]);
561 break;
562
558 case "load": 563 case "load":
559 switch (args[1].ToLower()) 564 switch (args[1].ToLower())
560 { 565 {
diff --git a/OpenSim.Terrain.BasicTerrain/TerrainEngine.cs b/OpenSim.Terrain.BasicTerrain/TerrainEngine.cs
index f97045a..0b066aa 100644
--- a/OpenSim.Terrain.BasicTerrain/TerrainEngine.cs
+++ b/OpenSim.Terrain.BasicTerrain/TerrainEngine.cs
@@ -219,6 +219,11 @@ namespace OpenSim.Terrain
219 } 219 }
220 } 220 }
221 221
222 public static TerrainEngine operator *(TerrainEngine meep, Double val) {
223 meep.heightmap *= val;
224 return meep;
225 }
226
222 public float this[int x, int y] 227 public float this[int x, int y]
223 { 228 {
224 get 229 get