diff options
author | Melanie | 2012-11-13 10:49:24 +0000 |
---|---|---|
committer | Melanie | 2012-11-13 10:49:24 +0000 |
commit | af01a2320a4449b8852248a7b7264fde7e5ab726 (patch) | |
tree | c8b704c7efdc603751acb2d3c47a2873848413ac /OpenSim/Region/CoreModules/World/Terrain | |
parent | Merge branch 'master' into careminster (diff) | |
parent | Moved the WindModule and its own plugins out of .addin.xml (diff) | |
download | opensim-SC_OLD-af01a2320a4449b8852248a7b7264fde7e5ab726.zip opensim-SC_OLD-af01a2320a4449b8852248a7b7264fde7e5ab726.tar.gz opensim-SC_OLD-af01a2320a4449b8852248a7b7264fde7e5ab726.tar.bz2 opensim-SC_OLD-af01a2320a4449b8852248a7b7264fde7e5ab726.tar.xz |
Merge branch 'master' into careminster
Diffstat (limited to 'OpenSim/Region/CoreModules/World/Terrain')
-rw-r--r-- | OpenSim/Region/CoreModules/World/Terrain/TerrainModule.cs | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/OpenSim/Region/CoreModules/World/Terrain/TerrainModule.cs b/OpenSim/Region/CoreModules/World/Terrain/TerrainModule.cs index d99567c..33aabe4 100644 --- a/OpenSim/Region/CoreModules/World/Terrain/TerrainModule.cs +++ b/OpenSim/Region/CoreModules/World/Terrain/TerrainModule.cs | |||
@@ -33,6 +33,7 @@ using System.Net; | |||
33 | using log4net; | 33 | using log4net; |
34 | using Nini.Config; | 34 | using Nini.Config; |
35 | using OpenMetaverse; | 35 | using OpenMetaverse; |
36 | using Mono.Addins; | ||
36 | using OpenSim.Framework; | 37 | using OpenSim.Framework; |
37 | using OpenSim.Region.CoreModules.Framework.InterfaceCommander; | 38 | using OpenSim.Region.CoreModules.Framework.InterfaceCommander; |
38 | using OpenSim.Region.CoreModules.World.Terrain.FileLoaders; | 39 | using OpenSim.Region.CoreModules.World.Terrain.FileLoaders; |
@@ -43,6 +44,7 @@ using OpenSim.Region.Framework.Scenes; | |||
43 | 44 | ||
44 | namespace OpenSim.Region.CoreModules.World.Terrain | 45 | namespace OpenSim.Region.CoreModules.World.Terrain |
45 | { | 46 | { |
47 | [Extension(Path = "/OpenSim/RegionModules", NodeName = "RegionModule", Id = "TerrainModule")] | ||
46 | public class TerrainModule : INonSharedRegionModule, ICommandableModule, ITerrainModule | 48 | public class TerrainModule : INonSharedRegionModule, ICommandableModule, ITerrainModule |
47 | { | 49 | { |
48 | #region StandardTerrainEffects enum | 50 | #region StandardTerrainEffects enum |