From cb07ba0d68eeb57bae1cb60f387483ff720cc29d Mon Sep 17 00:00:00 2001
From: Teravus Ovares
Date: Sat, 10 Nov 2007 19:13:52 +0000
Subject: * Moves the Meshmerizer to a separate plugin * Experimental.   Linux
 Prebuild needs testing. * One more update after this to remove the ODEMeshing
 directory....

---
 OpenSim/Region/Application/OpenSimMain.cs | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

(limited to 'OpenSim/Region/Application')

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
         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
     }
-}
\ No newline at end of file
+}
-- 
cgit v1.1