and now.. seems to work.. but does it really work?

avinationmerge
UbitUmarov 2015-09-08 21:41:52 +01:00
parent 6dc4c8321d
commit 254008cd1f
3 changed files with 68 additions and 54 deletions

View File

@ -95,6 +95,9 @@ namespace OpenSim.Region.PhysicsModule.UbitMeshing
IConfig start_config = config.Configs["Startup"]; IConfig start_config = config.Configs["Startup"];
IConfig mesh_config = config.Configs["Mesh"]; IConfig mesh_config = config.Configs["Mesh"];
string mesher = start_config.GetString("meshing", string.Empty);
if (mesher == Name)
{
float fcache = 48.0f; float fcache = 48.0f;
// float fcache = 0.02f; // float fcache = 0.02f;
@ -114,10 +117,11 @@ namespace OpenSim.Region.PhysicsModule.UbitMeshing
doMeshFileCache = false; doMeshFileCache = false;
doCacheExpire = false; doCacheExpire = false;
} }
m_Enabled = true;
} }
CacheExpire = TimeSpan.FromHours(fcache); CacheExpire = TimeSpan.FromHours(fcache);
}
} }
public void Close() public void Close()
{ {

View File

@ -408,8 +408,13 @@ namespace OpenSim.Region.PhysicsModule.UbitOde
mesher = scene.RequestModuleInterface<IMesher>(); mesher = scene.RequestModuleInterface<IMesher>();
if (mesher == null) if (mesher == null)
m_log.WarnFormat("{0} No mesher. Things will not work well.", LogHeader); {
m_log.WarnFormat("{0} No mesher. module disabled", LogHeader);
m_Enabled = false;
return;
}
region_loaded();
scene.PhysicsEnabled = true; scene.PhysicsEnabled = true;
} }
#endregion #endregion
@ -508,7 +513,10 @@ namespace OpenSim.Region.PhysicsModule.UbitOde
m_suportCombine = false; m_suportCombine = false;
// checkThread(); // checkThread();
}
private void region_loaded()
{
string ode_config = d.GetConfiguration(); string ode_config = d.GetConfiguration();
if (ode_config != null && ode_config != "") if (ode_config != null && ode_config != "")
{ {

View File

@ -1609,6 +1609,8 @@
<Reference name="System.Core"/> <Reference name="System.Core"/>
<Reference name="System.Data"/> <Reference name="System.Data"/>
<Reference name="System.Xml"/> <Reference name="System.Xml"/>
<Reference name="OpenSim.Framework"/>
<Reference name="Mono.Addins" path="../../../../bin/"/>
<Files> <Files>
<Match pattern="*.cs" recurse="true"> <Match pattern="*.cs" recurse="true">