aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim')
-rw-r--r--OpenSim/Grid/AssetServer/Main.cs2
-rw-r--r--OpenSim/Region/Environment/Modules/Terrain/TerrainChannel.cs13
2 files changed, 8 insertions, 7 deletions
diff --git a/OpenSim/Grid/AssetServer/Main.cs b/OpenSim/Grid/AssetServer/Main.cs
index c863c76..3a38e85 100644
--- a/OpenSim/Grid/AssetServer/Main.cs
+++ b/OpenSim/Grid/AssetServer/Main.cs
@@ -76,7 +76,7 @@ namespace OpenSim.Grid.AssetServer
76 } 76 }
77 } 77 }
78 78
79 private OpenAsset_Main() 79 public OpenAsset_Main()
80 { 80 {
81 m_console = new ConsoleBase("OpenAsset", this); 81 m_console = new ConsoleBase("OpenAsset", this);
82 82
diff --git a/OpenSim/Region/Environment/Modules/Terrain/TerrainChannel.cs b/OpenSim/Region/Environment/Modules/Terrain/TerrainChannel.cs
index 74af2c1..6e1a5d6 100644
--- a/OpenSim/Region/Environment/Modules/Terrain/TerrainChannel.cs
+++ b/OpenSim/Region/Environment/Modules/Terrain/TerrainChannel.cs
@@ -121,12 +121,13 @@ namespace OpenSim.Region.Environment.Modules.Terrain
121 { 121 {
122 for (y = 0; y < Constants.RegionSize; y++) 122 for (y = 0; y < Constants.RegionSize; y++)
123 { 123 {
124 map[x, y] = TerrainUtil.PerlinNoise2D(x, y, 3, 0.25) * 10; 124 //map[x, y] = TerrainUtil.PerlinNoise2D(x, y, 3, 0.25) * 10;
125 double spherFac = TerrainUtil.SphericalFactor(x, y, Constants.RegionSize, Constants.RegionSize, 20); 125 // double spherFac = TerrainUtil.SphericalFactor(x, y, Constants.RegionSize, Constants.RegionSize, 20);
126 if (map[x, y] < spherFac) 126 // if (map[x, y] < spherFac)
127 { 127 // {
128 map[x, y] = spherFac; 128 // map[x, y] = spherFac;
129 } 129 // }
130 map[x, y] = 26;
130 } 131 }
131 } 132 }
132 } 133 }