diff options
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/Application/OpenSimMain.cs | 17 |
1 files changed, 12 insertions, 5 deletions
diff --git a/OpenSim/Region/Application/OpenSimMain.cs b/OpenSim/Region/Application/OpenSimMain.cs index d7bed31..5409fea 100644 --- a/OpenSim/Region/Application/OpenSimMain.cs +++ b/OpenSim/Region/Application/OpenSimMain.cs | |||
@@ -119,9 +119,6 @@ namespace OpenSim | |||
119 | 119 | ||
120 | startuptime = DateTime.Now; | 120 | startuptime = DateTime.Now; |
121 | 121 | ||
122 | this.m_physicsManager = new PhysicsPluginManager(); | ||
123 | this.m_physicsManager.LoadPlugins(); | ||
124 | |||
125 | this.SetupScene(); | 122 | this.SetupScene(); |
126 | 123 | ||
127 | m_log.Verbose("Main.cs:Startup() - Initialising HTTP server"); | 124 | m_log.Verbose("Main.cs:Startup() - Initialising HTTP server"); |
@@ -231,7 +228,9 @@ namespace OpenSim | |||
231 | scene.LoadStorageDLL("OpenSim.Region.Storage.LocalStorageDb4o.dll"); //all these dll names shouldn't be hard coded. | 228 | scene.LoadStorageDLL("OpenSim.Region.Storage.LocalStorageDb4o.dll"); //all these dll names shouldn't be hard coded. |
232 | scene.LoadWorldMap(); | 229 | scene.LoadWorldMap(); |
233 | 230 | ||
234 | scene.PhysScene = this.m_physicsManager.GetPhysicsScene( this.m_physicsEngine ); | 231 | PhysicsScene physicsScene = GetPhysicsScene( m_physicsEngine ); |
232 | |||
233 | scene.PhysScene = physicsScene; | ||
235 | scene.PhysScene.SetTerrain(scene.Terrain.getHeights1D()); | 234 | scene.PhysScene.SetTerrain(scene.Terrain.getHeights1D()); |
236 | scene.LoadPrimsFromStorage(); | 235 | scene.LoadPrimsFromStorage(); |
237 | 236 | ||
@@ -254,6 +253,14 @@ namespace OpenSim | |||
254 | } | 253 | } |
255 | } | 254 | } |
256 | 255 | ||
256 | private static PhysicsScene GetPhysicsScene(string physicsEngine) | ||
257 | { | ||
258 | PhysicsPluginManager physicsPluginManager; | ||
259 | physicsPluginManager = new PhysicsPluginManager(); | ||
260 | physicsPluginManager.LoadPlugins(); | ||
261 | return physicsPluginManager.GetPhysicsScene( physicsEngine ); | ||
262 | } | ||
263 | |||
257 | private class SimStatusHandler : IStreamHandler | 264 | private class SimStatusHandler : IStreamHandler |
258 | { | 265 | { |
259 | public byte[] Handle(string path, Stream request) | 266 | public byte[] Handle(string path, Stream request) |
@@ -359,7 +366,7 @@ namespace OpenSim | |||
359 | this.gridLocalAsset = Convert.ToBoolean(attri); | 366 | this.gridLocalAsset = Convert.ToBoolean(attri); |
360 | } | 367 | } |
361 | 368 | ||
362 | 369 | ||
363 | attri = ""; | 370 | attri = ""; |
364 | attri = configData.GetAttribute("PhysicsEngine"); | 371 | attri = configData.GetAttribute("PhysicsEngine"); |
365 | switch (attri) | 372 | switch (attri) |