aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--OpenSim/Region/PhysicsModules/UbitMeshing/Meshmerizer.cs6
1 files changed, 4 insertions, 2 deletions
diff --git a/OpenSim/Region/PhysicsModules/UbitMeshing/Meshmerizer.cs b/OpenSim/Region/PhysicsModules/UbitMeshing/Meshmerizer.cs
index ea86bb3..58a93a1 100644
--- a/OpenSim/Region/PhysicsModules/UbitMeshing/Meshmerizer.cs
+++ b/OpenSim/Region/PhysicsModules/UbitMeshing/Meshmerizer.cs
@@ -93,15 +93,14 @@ namespace OpenSim.Region.PhysicsModule.UbitMeshing
93 public void Initialise(IConfigSource config) 93 public void Initialise(IConfigSource config)
94 { 94 {
95 IConfig start_config = config.Configs["Startup"]; 95 IConfig start_config = config.Configs["Startup"];
96 IConfig mesh_config = config.Configs["Mesh"];
97 96
98 string mesher = start_config.GetString("meshing", string.Empty); 97 string mesher = start_config.GetString("meshing", string.Empty);
99 if (mesher == Name) 98 if (mesher == Name)
100 { 99 {
101
102 float fcache = 48.0f; 100 float fcache = 48.0f;
103 // float fcache = 0.02f; 101 // float fcache = 0.02f;
104 102
103 IConfig mesh_config = config.Configs["Mesh"];
105 if (mesh_config != null) 104 if (mesh_config != null)
106 { 105 {
107 useMeshiesPhysicsMesh = mesh_config.GetBoolean("UseMeshiesPhysicsMesh", useMeshiesPhysicsMesh); 106 useMeshiesPhysicsMesh = mesh_config.GetBoolean("UseMeshiesPhysicsMesh", useMeshiesPhysicsMesh);
@@ -117,12 +116,15 @@ namespace OpenSim.Region.PhysicsModule.UbitMeshing
117 doMeshFileCache = false; 116 doMeshFileCache = false;
118 doCacheExpire = false; 117 doCacheExpire = false;
119 } 118 }
119
120 m_Enabled = true; 120 m_Enabled = true;
121 } 121 }
122 122
123 CacheExpire = TimeSpan.FromHours(fcache); 123 CacheExpire = TimeSpan.FromHours(fcache);
124
124 } 125 }
125 } 126 }
127
126 public void Close() 128 public void Close()
127 { 129 {
128 } 130 }