OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

* Issue#209 - Terrain Hills Patch (Thanks Babblefrog) 

* Issue#208 - Region crossing should be using External host (Thanks Babblefrog)
* Issue#207 - Prebuild.xml contains path errors (Thanks Gareth)
afrisby
Adam Frisby 2007-07-21 07:23:00 +00:00
parent cd5877557c
commit 32aacd4f36
3 changed files with 16 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
OpenSim/Region/Environment/Scenes/ScenePresence.cs
View File

@ -555,7 +555,7 @@ namespace OpenSim.Region.Environment.Scenes
if (res) if (res)
{ {
this.MakeChildAgent(); this.MakeChildAgent();
this.ControllingClient.CrossRegion(neighbourHandle, newpos, vel, neighbourRegion.InternalEndPoint); this.ControllingClient.CrossRegion(neighbourHandle, newpos, vel, neighbourRegion.ExternalEndPoint);
} }
} }
} }

18
OpenSim/Region/Terrain.BasicTerrain/TerrainEngine.cs
View File

@ -216,6 +216,8 @@ namespace OpenSim.Region.Terrain
{ {
case "help": case "help":
resultText += "terrain regenerate - rebuilds the sims terrain using a default algorithm\n"; resultText += "terrain regenerate - rebuilds the sims terrain using a default algorithm\n";
resultText += "terrain hills <type> <number of hills> <min height> <max height> <island t/f> <additive t/f> <noisy t/f>\n";
resultText += " type should be spheres, blocks, cones, or squared\n";
resultText += "terrain voronoi <points> <blocksize> - generates a worley fractal with X points per block"; resultText += "terrain voronoi <points> <blocksize> - generates a worley fractal with X points per block";
resultText += "terrain seed <seed> - sets the random seed value to <seed>\n"; resultText += "terrain seed <seed> - sets the random seed value to <seed>\n";
resultText += "terrain load <type> <filename> - loads a terrain from disk, type can be 'F32', 'F64', 'RAW' or 'IMG'\n"; 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
case "multiply": case "multiply":
heightmap *= Convert.ToDouble(args[1]); heightmap *= Convert.ToDouble(args[1]);
tainted++;
break; break;
case "load": case "load":
@ -383,6 +386,8 @@ namespace OpenSim.Region.Terrain
private bool consoleHills(string[] args, ref string resultText) private bool consoleHills(string[] args, ref string resultText)
{ {
Random RandomClass = new Random();
setSeed(RandomClass.Next());
int count; int count;
double sizeMin; double sizeMin;
double sizeRange; double sizeRange;
@ -392,12 +397,12 @@ namespace OpenSim.Region.Terrain
if (args.GetLength(0) > 2) if (args.GetLength(0) > 2)
{ {
count = Convert.ToInt32(args[2]); int.TryParse(args[2].ToString(), out count);
sizeMin = Convert.ToDouble(args[3]); double.TryParse(args[3].ToString(), out sizeMin);
sizeRange = Convert.ToDouble(args[4]); double.TryParse(args[4].ToString(), out sizeRange);
island = Convert.ToBoolean(args[5]); bool.TryParse(args[5].ToString(), out island);
additive = Convert.ToBoolean(args[6]); bool.TryParse(args[6].ToString(), out additive);
noisy = Convert.ToBoolean(args[7]); bool.TryParse(args[7].ToString(), out noisy);
} }
else else
{ {
@ -427,6 +432,7 @@ namespace OpenSim.Region.Terrain
resultText = "Unknown hills type"; resultText = "Unknown hills type";
return false; return false;
} }
tainted++;
return true; return true;
} }

3
prebuild.xml
View File

@ -116,7 +116,7 @@
</Options> </Options>
</Configuration> </Configuration>
<ReferencePath>../../../bin/</ReferencePath> <ReferencePath>../../../../bin/</ReferencePath>
<Reference name="System"/> <Reference name="System"/>
<Reference name="System.Xml"/> <Reference name="System.Xml"/>
<Reference name="libsecondlife.dll"/> <Reference name="libsecondlife.dll"/>
@ -124,6 +124,7 @@
<Reference name="XMLRPC.dll"/> <Reference name="XMLRPC.dll"/>
<Reference name="OpenSim.Framework"/> <Reference name="OpenSim.Framework"/>
<Reference name="OpenSim.Framework.Console"/> <Reference name="OpenSim.Framework.Console"/>
<Reference name="OpenSim.Framework.Configuration"/>
<Reference name="OpenSim.Framework.Data"/> <Reference name="OpenSim.Framework.Data"/>
<Files> <Files>
<Match pattern="*.cs" recurse="true"/> <Match pattern="*.cs" recurse="true"/>