ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-08-09 10:46:00 +08:00
Code Issues Packages Projects Releases Wiki Activity

* Removed some superfluous assigns

Browse Source 
* Moved physics plugin scene creation into local scope
This commit is contained in:
lbsa71
2007-07-16 18:37:31 +00:00
parent 58f4d69833
commit e6dea73d1f
3 changed files with 14 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
OpenSim/Region/Application/OpenSimMain.cs
View File

@@ -119,9 +119,6 @@ namespace OpenSim
startuptime = DateTime.Now;
this.m_physicsManager = new PhysicsPluginManager();
this.m_physicsManager.LoadPlugins();
this.SetupScene();
m_log.Verbose("Main.cs:Startup() - Initialising HTTP server");
@@ -231,7 +228,9 @@ namespace OpenSim
scene.LoadStorageDLL("OpenSim.Region.Storage.LocalStorageDb4o.dll"); //all these dll names shouldn't be hard coded.
scene.LoadWorldMap();
scene.PhysScene = this.m_physicsManager.GetPhysicsScene( this.m_physicsEngine );
PhysicsScene physicsScene = GetPhysicsScene( m_physicsEngine );
scene.PhysScene = physicsScene;
scene.PhysScene.SetTerrain(scene.Terrain.getHeights1D());
scene.LoadPrimsFromStorage();
@@ -254,6 +253,14 @@ namespace OpenSim
}
}
private static PhysicsScene GetPhysicsScene(string physicsEngine)
{
PhysicsPluginManager physicsPluginManager;
physicsPluginManager = new PhysicsPluginManager();
physicsPluginManager.LoadPlugins();
return physicsPluginManager.GetPhysicsScene( physicsEngine );
}
private class SimStatusHandler : IStreamHandler
{
public byte[] Handle(string path, Stream request)
@@ -359,7 +366,7 @@ namespace OpenSim
this.gridLocalAsset = Convert.ToBoolean(attri);
}
attri = "";
attri = configData.GetAttribute("PhysicsEngine");
switch (attri)