aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim.RegionServer/world/World.cs
diff options
context:
space:
mode:
authorMW2007-04-06 19:08:24 +0000
committerMW2007-04-06 19:08:24 +0000
commit0311fef2447217fb87111835d82654cdc6c6dd31 (patch)
tree807f294533592c850794ee23377017a8085c0fb5 /OpenSim.RegionServer/world/World.cs
parentAdded getHeights1D() function to TerrainEngine (diff)
downloadopensim-SC_OLD-0311fef2447217fb87111835d82654cdc6c6dd31.zip
opensim-SC_OLD-0311fef2447217fb87111835d82654cdc6c6dd31.tar.gz
opensim-SC_OLD-0311fef2447217fb87111835d82654cdc6c6dd31.tar.bz2
opensim-SC_OLD-0311fef2447217fb87111835d82654cdc6c6dd31.tar.xz
Now back to compiling, just no terrain generation at the moment
Diffstat (limited to 'OpenSim.RegionServer/world/World.cs')
-rw-r--r--OpenSim.RegionServer/world/World.cs10
1 files changed, 5 insertions, 5 deletions
diff --git a/OpenSim.RegionServer/world/World.cs b/OpenSim.RegionServer/world/World.cs
index c23ac2d..73c04d8 100644
--- a/OpenSim.RegionServer/world/World.cs
+++ b/OpenSim.RegionServer/world/World.cs
@@ -195,7 +195,7 @@ namespace OpenSim.world
195 195
196 lock (this.LockPhysicsEngine) 196 lock (this.LockPhysicsEngine)
197 { 197 {
198 this.phyScene.SetTerrain(Terrain.map); 198 this.phyScene.SetTerrain(Terrain.getHeights1D());
199 } 199 }
200 this.localStorage.SaveMap(this.Terrain.map); 200 this.localStorage.SaveMap(this.Terrain.map);
201 201
@@ -215,7 +215,7 @@ namespace OpenSim.world
215 this.Terrain.map = newMap; 215 this.Terrain.map = newMap;
216 lock (this.LockPhysicsEngine) 216 lock (this.LockPhysicsEngine)
217 { 217 {
218 this.phyScene.SetTerrain(this.Terrain.map); 218 this.phyScene.SetTerrain(this.Terrain.getHeights1D());
219 } 219 }
220 this.localStorage.SaveMap(this.Terrain.map); 220 this.localStorage.SaveMap(this.Terrain.map);
221 221
@@ -236,7 +236,7 @@ namespace OpenSim.world
236 { 236 {
237 lock (this.LockPhysicsEngine) 237 lock (this.LockPhysicsEngine)
238 { 238 {
239 this.phyScene.SetTerrain(this.Terrain.map); 239 this.phyScene.SetTerrain(this.Terrain.getHeights1D());
240 } 240 }
241 this.localStorage.SaveMap(this.Terrain.map); 241 this.localStorage.SaveMap(this.Terrain.map);
242 242
@@ -290,7 +290,7 @@ namespace OpenSim.world
290 patches[2] = x + 2 + y * 16; 290 patches[2] = x + 2 + y * 16;
291 patches[3] = x + 3 + y * 16; 291 patches[3] = x + 3 + y * 16;
292 292
293 Packet layerpack = TerrainManager.CreateLandPacket(Terrain.map, patches); 293 Packet layerpack = TerrainManager.CreateLandPacket(Terrain.getHeights1D(), patches);
294 RemoteClient.OutPacket(layerpack); 294 RemoteClient.OutPacket(layerpack);
295 } 295 }
296 } 296 }
@@ -312,7 +312,7 @@ namespace OpenSim.world
312 //patches[2] = patchx + 2 + patchy * 16; 312 //patches[2] = patchx + 2 + patchy * 16;
313 //patches[3] = patchx + 3 + patchy * 16; 313 //patches[3] = patchx + 3 + patchy * 16;
314 314
315 Packet layerpack = TerrainManager.CreateLandPacket(Terrain.map, patches); 315 Packet layerpack = TerrainManager.CreateLandPacket(Terrain.getHeights1D(), patches);
316 RemoteClient.OutPacket(layerpack); 316 RemoteClient.OutPacket(layerpack);
317 } 317 }
318 318