diff options
| author | Justin Clark-Casey (justincc) | 2012-11-14 02:30:12 +0000 |
|---|---|---|
| committer | Justin Clark-Casey (justincc) | 2012-11-14 02:30:12 +0000 |
| commit | 564fe35d4d88009f7ca9f7c1b8e3eafb13a2cc1c (patch) | |
| tree | 1d046904229e0a6c36481c255ceb71eda7c72872 /OpenSim/Region/CoreModules/World/Terrain/TerrainModule.cs | |
| parent | Stop Prebuild from generating <copy> statements which unnecessarily copy file... (diff) | |
| parent | Deleted OptionalModules.addin.xml. Added AssemblyInfo.cs for that dll. (diff) | |
| download | opensim-SC_OLD-564fe35d4d88009f7ca9f7c1b8e3eafb13a2cc1c.zip opensim-SC_OLD-564fe35d4d88009f7ca9f7c1b8e3eafb13a2cc1c.tar.gz opensim-SC_OLD-564fe35d4d88009f7ca9f7c1b8e3eafb13a2cc1c.tar.bz2 opensim-SC_OLD-564fe35d4d88009f7ca9f7c1b8e3eafb13a2cc1c.tar.xz | |
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
Diffstat (limited to 'OpenSim/Region/CoreModules/World/Terrain/TerrainModule.cs')
| -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 4694b14..52b4313 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 |