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

* Moves the Meshmerizer to a separate plugin

Browse Source 
* Experimental.   Linux Prebuild needs testing.
* One more update after this to remove the ODEMeshing directory....
This commit is contained in:
Teravus Ovares
2007-11-10 19:13:52 +00:00
parent 43ea37b5a0
commit cb07ba0d68
18 changed files with 1996 additions and 68 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -54,6 +54,7 @@ namespace OpenSim
private const string DEFAULT_PRIM_BACKUP_FILENAME = "prim-backup.xml";
public string m_physicsEngine;
public string m_meshEngineName;
public string m_scriptEngine;
public bool m_sandbox;
public bool user_accounts;
@@ -210,6 +211,7 @@ namespace OpenSim
{
m_sandbox = !startupConfig.GetBoolean("gridmode", false);
m_physicsEngine = startupConfig.GetString("physics", "basicphysics");
m_meshEngineName = startupConfig.GetString("meshing", "Meshmerizer");
m_verbose = startupConfig.GetBoolean("verbose", true);
m_permissions = startupConfig.GetBoolean("serverside_object_permissions", false);
@@ -404,7 +406,7 @@ namespace OpenSim
protected override PhysicsScene GetPhysicsScene()
{
return GetPhysicsScene(m_physicsEngine);
return GetPhysicsScene(m_physicsEngine, m_meshEngineName);
}
private class SimStatusHandler : IStreamedRequestHandler
@@ -767,4 +769,4 @@ namespace OpenSim
#endregion
}
}
}