aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
-rw-r--r--OpenSim/Region/Environment/Scenes/ScenePresence.cs2
-rw-r--r--OpenSim/Region/Terrain.BasicTerrain/TerrainEngine.cs20
-rw-r--r--prebuild.xml3
3 files changed, 16 insertions, 9 deletions
diff --git a/OpenSim/Region/Environment/Scenes/ScenePresence.cs b/OpenSim/Region/Environment/Scenes/ScenePresence.cs
index 473dae9..2bb4fb2 100644
--- a/OpenSim/Region/Environment/Scenes/ScenePresence.cs
+++ b/OpenSim/Region/Environment/Scenes/ScenePresence.cs
@@ -555,7 +555,7 @@ namespace OpenSim.Region.Environment.Scenes
555 if (res) 555 if (res)
556 { 556 {
557 this.MakeChildAgent(); 557 this.MakeChildAgent();
558 this.ControllingClient.CrossRegion(neighbourHandle, newpos, vel, neighbourRegion.InternalEndPoint); 558 this.ControllingClient.CrossRegion(neighbourHandle, newpos, vel, neighbourRegion.ExternalEndPoint);
559 } 559 }
560 } 560 }
561 } 561 }
diff --git a/OpenSim/Region/Terrain.BasicTerrain/TerrainEngine.cs b/OpenSim/Region/Terrain.BasicTerrain/TerrainEngine.cs
index 6f3afea..8f3e04f 100644
--- a/OpenSim/Region/Terrain.BasicTerrain/TerrainEngine.cs
+++ b/OpenSim/Region/Terrain.BasicTerrain/TerrainEngine.cs
@@ -216,6 +216,8 @@ namespace OpenSim.Region.Terrain
216 { 216 {
217 case "help": 217 case "help":
218 resultText += "terrain regenerate - rebuilds the sims terrain using a default algorithm\n"; 218 resultText += "terrain regenerate - rebuilds the sims terrain using a default algorithm\n";
219 resultText += "terrain hills <type> <number of hills> <min height> <max height> <island t/f> <additive t/f> <noisy t/f>\n";
220 resultText += " type should be spheres, blocks, cones, or squared\n";
219 resultText += "terrain voronoi <points> <blocksize> - generates a worley fractal with X points per block"; 221 resultText += "terrain voronoi <points> <blocksize> - generates a worley fractal with X points per block";
220 resultText += "terrain seed <seed> - sets the random seed value to <seed>\n"; 222 resultText += "terrain seed <seed> - sets the random seed value to <seed>\n";
221 resultText += "terrain load <type> <filename> - loads a terrain from disk, type can be 'F32', 'F64', 'RAW' or 'IMG'\n"; 223 resultText += "terrain load <type> <filename> - loads a terrain from disk, type can be 'F32', 'F64', 'RAW' or 'IMG'\n";
@@ -272,6 +274,7 @@ namespace OpenSim.Region.Terrain
272 274
273 case "multiply": 275 case "multiply":
274 heightmap *= Convert.ToDouble(args[1]); 276 heightmap *= Convert.ToDouble(args[1]);
277 tainted++;
275 break; 278 break;
276 279
277 case "load": 280 case "load":
@@ -383,6 +386,8 @@ namespace OpenSim.Region.Terrain
383 386
384 private bool consoleHills(string[] args, ref string resultText) 387 private bool consoleHills(string[] args, ref string resultText)
385 { 388 {
389 Random RandomClass = new Random();
390 setSeed(RandomClass.Next());
386 int count; 391 int count;
387 double sizeMin; 392 double sizeMin;
388 double sizeRange; 393 double sizeRange;
@@ -392,12 +397,12 @@ namespace OpenSim.Region.Terrain
392 397
393 if (args.GetLength(0) > 2) 398 if (args.GetLength(0) > 2)
394 { 399 {
395 count = Convert.ToInt32(args[2]); 400 int.TryParse(args[2].ToString(), out count);
396 sizeMin = Convert.ToDouble(args[3]); 401 double.TryParse(args[3].ToString(), out sizeMin);
397 sizeRange = Convert.ToDouble(args[4]); 402 double.TryParse(args[4].ToString(), out sizeRange);
398 island = Convert.ToBoolean(args[5]); 403 bool.TryParse(args[5].ToString(), out island);
399 additive = Convert.ToBoolean(args[6]); 404 bool.TryParse(args[6].ToString(), out additive);
400 noisy = Convert.ToBoolean(args[7]); 405 bool.TryParse(args[7].ToString(), out noisy);
401 } 406 }
402 else 407 else
403 { 408 {
@@ -427,6 +432,7 @@ namespace OpenSim.Region.Terrain
427 resultText = "Unknown hills type"; 432 resultText = "Unknown hills type";
428 return false; 433 return false;
429 } 434 }
435 tainted++;
430 return true; 436 return true;
431 } 437 }
432 438
@@ -951,4 +957,4 @@ namespace OpenSim.Region.Terrain
951 return imageData; 957 return imageData;
952 } 958 }
953 } 959 }
954} \ No newline at end of file 960}
diff --git a/prebuild.xml b/prebuild.xml
index 6580fec..42824a5 100644
--- a/prebuild.xml
+++ b/prebuild.xml
@@ -116,7 +116,7 @@
116 </Options> 116 </Options>
117 </Configuration> 117 </Configuration>
118 118
119 <ReferencePath>../../../bin/</ReferencePath> 119 <ReferencePath>../../../../bin/</ReferencePath>
120 <Reference name="System"/> 120 <Reference name="System"/>
121 <Reference name="System.Xml"/> 121 <Reference name="System.Xml"/>
122 <Reference name="libsecondlife.dll"/> 122 <Reference name="libsecondlife.dll"/>
@@ -124,6 +124,7 @@
124 <Reference name="XMLRPC.dll"/> 124 <Reference name="XMLRPC.dll"/>
125 <Reference name="OpenSim.Framework"/> 125 <Reference name="OpenSim.Framework"/>
126 <Reference name="OpenSim.Framework.Console"/> 126 <Reference name="OpenSim.Framework.Console"/>
127 <Reference name="OpenSim.Framework.Configuration"/>
127 <Reference name="OpenSim.Framework.Data"/> 128 <Reference name="OpenSim.Framework.Data"/>
128 <Files> 129 <Files>
129 <Match pattern="*.cs" recurse="true"/> 130 <Match pattern="*.cs" recurse="true"/>