aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim.RegionServer/OpenSimMain.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/OpenSimMain.cs
parentAdded getHeights1D() function to TerrainEngine (diff)
downloadopensim-SC-0311fef2447217fb87111835d82654cdc6c6dd31.zip
opensim-SC-0311fef2447217fb87111835d82654cdc6c6dd31.tar.gz
opensim-SC-0311fef2447217fb87111835d82654cdc6c6dd31.tar.bz2
opensim-SC-0311fef2447217fb87111835d82654cdc6c6dd31.tar.xz
Now back to compiling, just no terrain generation at the moment
Diffstat (limited to '')
-rw-r--r--OpenSim.RegionServer/OpenSimMain.cs2
1 files changed, 1 insertions, 1 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
156 156
157 m_console.WriteLine("Main.cs:Startup() - Starting up messaging system"); 157 m_console.WriteLine("Main.cs:Startup() - Starting up messaging system");
158 LocalWorld.PhysScene = this.physManager.GetPhysicsScene(this.m_physicsEngine); //should be reading from the config file what physics engine to use 158 LocalWorld.PhysScene = this.physManager.GetPhysicsScene(this.m_physicsEngine); //should be reading from the config file what physics engine to use
159 LocalWorld.PhysScene.SetTerrain(LocalWorld.Terrain.map); 159 LocalWorld.PhysScene.SetTerrain(LocalWorld.Terrain.getHeights1D());
160 160
161 //should be passing a IGenericConfig object to these so they can read the config data they want from it 161 //should be passing a IGenericConfig object to these so they can read the config data they want from it
162 GridServers.AssetServer.SetServerInfo(regionData.AssetURL, regionData.AssetSendKey); 162 GridServers.AssetServer.SetServerInfo(regionData.AssetURL, regionData.AssetSendKey);