1 files changed, 22 insertions, 18 deletions

diff --git a/OpenSim/Region/PhysicsModules/UbitMeshing/Meshmerizer.cs b/OpenSim/Region/PhysicsModules/UbitMeshing/Meshmerizer.cs
index 60b0ce0..0bbd0db 100644
--- a/OpenSim/Region/PhysicsModules/UbitMeshing/Meshmerizer.cs
+++ b/OpenSim/Region/PhysicsModules/UbitMeshing/Meshmerizer.cs
@@ -95,29 +95,33 @@ namespace OpenSim.Region.PhysicsModule.UbitMeshing
             IConfig start_config = config.Configs["Startup"];
             IConfig mesh_config = config.Configs["Mesh"];
 
+            string mesher = start_config.GetString("meshing", string.Empty);
+            if (mesher == Name)
+            {
 
-            float fcache = 48.0f;
-//            float fcache = 0.02f;
+                float fcache = 48.0f;
+                //            float fcache = 0.02f;
 
-            if(mesh_config != null)
-            {
-                useMeshiesPhysicsMesh = mesh_config.GetBoolean("UseMeshiesPhysicsMesh", useMeshiesPhysicsMesh);
-                if (useMeshiesPhysicsMesh)
+                if (mesh_config != null)
                 {
-                    doMeshFileCache = mesh_config.GetBoolean("MeshFileCache", doMeshFileCache);
-                    cachePath = mesh_config.GetString("MeshFileCachePath", cachePath);
-                    fcache = mesh_config.GetFloat("MeshFileCacheExpireHours", fcache);
-                    doCacheExpire = mesh_config.GetBoolean("MeshFileCacheDoExpire", doCacheExpire);
-                }
-                else
-                {
-                    doMeshFileCache = false;
-                    doCacheExpire = false;
+                    useMeshiesPhysicsMesh = mesh_config.GetBoolean("UseMeshiesPhysicsMesh", useMeshiesPhysicsMesh);
+                    if (useMeshiesPhysicsMesh)
+                    {
+                        doMeshFileCache = mesh_config.GetBoolean("MeshFileCache", doMeshFileCache);
+                        cachePath = mesh_config.GetString("MeshFileCachePath", cachePath);
+                        fcache = mesh_config.GetFloat("MeshFileCacheExpireHours", fcache);
+                        doCacheExpire = mesh_config.GetBoolean("MeshFileCacheDoExpire", doCacheExpire);
+                    }
+                    else
+                    {
+                        doMeshFileCache = false;
+                        doCacheExpire = false;
+                    }
+                    m_Enabled = true;
                 }
-            }
-
-            CacheExpire = TimeSpan.FromHours(fcache);
 
+                CacheExpire = TimeSpan.FromHours(fcache);
+            }
         }
         public void Close()
         {