Now back to compiling, just no terrain generation at the moment

2 files changed, 6 insertions, 6 deletions

diff --git a/OpenSim.RegionServer/OpenSimMain.cs b/OpenSim.RegionServer/OpenSimMain.cs
index b159af0..fa5dfc2 100644
--- a/OpenSim.RegionServer/OpenSimMain.cs
+++ b/OpenSim.RegionServer/OpenSimMain.cs
@@ -156,7 +156,7 @@ namespace OpenSim
 

             m_console.WriteLine("Main.cs:Startup() - Starting up messaging system");

             LocalWorld.PhysScene = this.physManager.GetPhysicsScene(this.m_physicsEngine); //should be reading from the config file what physics engine to use

-            LocalWorld.PhysScene.SetTerrain(LocalWorld.Terrain.map);

+            LocalWorld.PhysScene.SetTerrain(LocalWorld.Terrain.getHeights1D());

 

             //should be passing a IGenericConfig object to these so they can read the config data they want from it

             GridServers.AssetServer.SetServerInfo(regionData.AssetURL, regionData.AssetSendKey);

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
 

             lock (this.LockPhysicsEngine)

             {

-                this.phyScene.SetTerrain(Terrain.map);

+                this.phyScene.SetTerrain(Terrain.getHeights1D());

             }

             this.localStorage.SaveMap(this.Terrain.map);

 

@@ -215,7 +215,7 @@ namespace OpenSim.world
             this.Terrain.map = newMap;

             lock (this.LockPhysicsEngine)

             {

-                this.phyScene.SetTerrain(this.Terrain.map);

+                this.phyScene.SetTerrain(this.Terrain.getHeights1D());

             }

             this.localStorage.SaveMap(this.Terrain.map);

 

@@ -236,7 +236,7 @@ namespace OpenSim.world
             {

                 lock (this.LockPhysicsEngine)

                 {

-                    this.phyScene.SetTerrain(this.Terrain.map);

+                    this.phyScene.SetTerrain(this.Terrain.getHeights1D());

                 }

                 this.localStorage.SaveMap(this.Terrain.map);

 

@@ -290,7 +290,7 @@ namespace OpenSim.world
                     patches[2] = x + 2 + y * 16;

                     patches[3] = x + 3 + y * 16;

 

-                    Packet layerpack = TerrainManager.CreateLandPacket(Terrain.map, patches);

+                    Packet layerpack = TerrainManager.CreateLandPacket(Terrain.getHeights1D(), patches);

                     RemoteClient.OutPacket(layerpack);

                 }

             }

@@ -312,7 +312,7 @@ namespace OpenSim.world
             //patches[2] = patchx + 2 + patchy * 16;

             //patches[3] = patchx + 3 + patchy * 16;

 

-            Packet layerpack = TerrainManager.CreateLandPacket(Terrain.map, patches);

+            Packet layerpack = TerrainManager.CreateLandPacket(Terrain.getHeights1D(), patches);

             RemoteClient.OutPacket(layerpack);

         }