diff options
author | Melanie | 2010-09-26 17:56:31 +0100 |
---|---|---|
committer | Melanie | 2010-09-26 17:56:31 +0100 |
commit | 6f689f591a295195cf8db3c37bcd382502d468d7 (patch) | |
tree | 87d7340eb92921c905a505cf89dd4a37d90ac381 /OpenSim/Region/Physics/Manager/PhysicsPluginManager.cs | |
parent | Merge branch 'master' into careminster-presence-refactor (diff) | |
download | opensim-SC-6f689f591a295195cf8db3c37bcd382502d468d7.zip opensim-SC-6f689f591a295195cf8db3c37bcd382502d468d7.tar.gz opensim-SC-6f689f591a295195cf8db3c37bcd382502d468d7.tar.bz2 opensim-SC-6f689f591a295195cf8db3c37bcd382502d468d7.tar.xz |
Merge Master
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/Physics/Manager/PhysicsPluginManager.cs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Region/Physics/Manager/PhysicsPluginManager.cs b/OpenSim/Region/Physics/Manager/PhysicsPluginManager.cs index 7130a3e..3763696 100644 --- a/OpenSim/Region/Physics/Manager/PhysicsPluginManager.cs +++ b/OpenSim/Region/Physics/Manager/PhysicsPluginManager.cs | |||
@@ -81,7 +81,7 @@ namespace OpenSim.Region.Physics.Manager | |||
81 | if (_MeshPlugins.ContainsKey(meshEngineName)) | 81 | if (_MeshPlugins.ContainsKey(meshEngineName)) |
82 | { | 82 | { |
83 | m_log.Info("[PHYSICS]: creating meshing engine " + meshEngineName); | 83 | m_log.Info("[PHYSICS]: creating meshing engine " + meshEngineName); |
84 | meshEngine = _MeshPlugins[meshEngineName].GetMesher(); | 84 | meshEngine = _MeshPlugins[meshEngineName].GetMesher(config); |
85 | } | 85 | } |
86 | else | 86 | else |
87 | { | 87 | { |
@@ -234,6 +234,6 @@ namespace OpenSim.Region.Physics.Manager | |||
234 | public interface IMeshingPlugin | 234 | public interface IMeshingPlugin |
235 | { | 235 | { |
236 | string GetName(); | 236 | string GetName(); |
237 | IMesher GetMesher(); | 237 | IMesher GetMesher(IConfigSource config); |
238 | } | 238 | } |
239 | } | 239 | } |