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/ZeroMesher.cs | |
| parent | Merge branch 'master' into careminster-presence-refactor (diff) | |
| download | opensim-SC_OLD-6f689f591a295195cf8db3c37bcd382502d468d7.zip opensim-SC_OLD-6f689f591a295195cf8db3c37bcd382502d468d7.tar.gz opensim-SC_OLD-6f689f591a295195cf8db3c37bcd382502d468d7.tar.bz2 opensim-SC_OLD-6f689f591a295195cf8db3c37bcd382502d468d7.tar.xz | |
Merge Master
Diffstat (limited to '')
| -rw-r--r-- | OpenSim/Region/Physics/Manager/ZeroMesher.cs | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/OpenSim/Region/Physics/Manager/ZeroMesher.cs b/OpenSim/Region/Physics/Manager/ZeroMesher.cs index e6e75f9..ba19db6 100644 --- a/OpenSim/Region/Physics/Manager/ZeroMesher.cs +++ b/OpenSim/Region/Physics/Manager/ZeroMesher.cs | |||
| @@ -28,6 +28,7 @@ | |||
| 28 | using System; | 28 | using System; |
| 29 | using OpenSim.Framework; | 29 | using OpenSim.Framework; |
| 30 | using OpenMetaverse; | 30 | using OpenMetaverse; |
| 31 | using Nini.Config; | ||
| 31 | 32 | ||
| 32 | /* | 33 | /* |
| 33 | * This is the zero mesher. | 34 | * This is the zero mesher. |
| @@ -53,7 +54,7 @@ namespace OpenSim.Region.Physics.Manager | |||
| 53 | return "ZeroMesher"; | 54 | return "ZeroMesher"; |
| 54 | } | 55 | } |
| 55 | 56 | ||
| 56 | public IMesher GetMesher() | 57 | public IMesher GetMesher(IConfigSource config) |
| 57 | { | 58 | { |
| 58 | return new ZeroMesher(); | 59 | return new ZeroMesher(); |
| 59 | } | 60 | } |