mirror of
https://github.com/opensim/opensim.git
synced 2026-08-11 20:05:33 +08:00
Merge Master
This commit is contained in:
@@ -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);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -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();
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user