diff options
Diffstat (limited to 'OpenSim/Region/Application/OpenSimMain.cs')
-rw-r--r-- | OpenSim/Region/Application/OpenSimMain.cs | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/OpenSim/Region/Application/OpenSimMain.cs b/OpenSim/Region/Application/OpenSimMain.cs index 684a9a8..42f1b94 100644 --- a/OpenSim/Region/Application/OpenSimMain.cs +++ b/OpenSim/Region/Application/OpenSimMain.cs | |||
@@ -54,6 +54,7 @@ namespace OpenSim | |||
54 | private const string DEFAULT_PRIM_BACKUP_FILENAME = "prim-backup.xml"; | 54 | private const string DEFAULT_PRIM_BACKUP_FILENAME = "prim-backup.xml"; |
55 | 55 | ||
56 | public string m_physicsEngine; | 56 | public string m_physicsEngine; |
57 | public string m_meshEngineName; | ||
57 | public string m_scriptEngine; | 58 | public string m_scriptEngine; |
58 | public bool m_sandbox; | 59 | public bool m_sandbox; |
59 | public bool user_accounts; | 60 | public bool user_accounts; |
@@ -210,6 +211,7 @@ namespace OpenSim | |||
210 | { | 211 | { |
211 | m_sandbox = !startupConfig.GetBoolean("gridmode", false); | 212 | m_sandbox = !startupConfig.GetBoolean("gridmode", false); |
212 | m_physicsEngine = startupConfig.GetString("physics", "basicphysics"); | 213 | m_physicsEngine = startupConfig.GetString("physics", "basicphysics"); |
214 | m_meshEngineName = startupConfig.GetString("meshing", "Meshmerizer"); | ||
213 | m_verbose = startupConfig.GetBoolean("verbose", true); | 215 | m_verbose = startupConfig.GetBoolean("verbose", true); |
214 | m_permissions = startupConfig.GetBoolean("serverside_object_permissions", false); | 216 | m_permissions = startupConfig.GetBoolean("serverside_object_permissions", false); |
215 | 217 | ||
@@ -404,7 +406,7 @@ namespace OpenSim | |||
404 | 406 | ||
405 | protected override PhysicsScene GetPhysicsScene() | 407 | protected override PhysicsScene GetPhysicsScene() |
406 | { | 408 | { |
407 | return GetPhysicsScene(m_physicsEngine); | 409 | return GetPhysicsScene(m_physicsEngine, m_meshEngineName); |
408 | } | 410 | } |
409 | 411 | ||
410 | private class SimStatusHandler : IStreamedRequestHandler | 412 | private class SimStatusHandler : IStreamedRequestHandler |
@@ -767,4 +769,4 @@ namespace OpenSim | |||
767 | 769 | ||
768 | #endregion | 770 | #endregion |
769 | } | 771 | } |
770 | } \ No newline at end of file | 772 | } |