Merge Master

This commit is contained in:
Melanie
2010-09-26 17:56:31 +01:00
parent 0080f28f1d
commit 6f689f591a
10 changed files with 50 additions and 20 deletions

View File

@@ -81,7 +81,7 @@ namespace OpenSim.Region.Physics.Manager
if (_MeshPlugins.ContainsKey(meshEngineName))
{
m_log.Info("[PHYSICS]: creating meshing engine " + meshEngineName);
meshEngine = _MeshPlugins[meshEngineName].GetMesher();
meshEngine = _MeshPlugins[meshEngineName].GetMesher(config);
}
else
{
@@ -234,6 +234,6 @@ namespace OpenSim.Region.Physics.Manager
public interface IMeshingPlugin
{
string GetName();
IMesher GetMesher();
IMesher GetMesher(IConfigSource config);
}
}

View File

@@ -28,6 +28,7 @@
using System;
using OpenSim.Framework;
using OpenMetaverse;
using Nini.Config;
/*
* This is the zero mesher.
@@ -53,7 +54,7 @@ namespace OpenSim.Region.Physics.Manager
return "ZeroMesher";
}
public IMesher GetMesher()
public IMesher GetMesher(IConfigSource config)
{
return new ZeroMesher();
}