diff options
Diffstat (limited to 'OpenSim/Region/Environment')
-rw-r--r-- | OpenSim/Region/Environment/Modules/Terrain/TerrainModule.cs (renamed from OpenSim/Region/Environment/Modules/TerrainModule.cs) | 3 | ||||
-rw-r--r-- | OpenSim/Region/Environment/Scenes/SceneBase.cs | 2 |
2 files changed, 4 insertions, 1 deletions
diff --git a/OpenSim/Region/Environment/Modules/TerrainModule.cs b/OpenSim/Region/Environment/Modules/Terrain/TerrainModule.cs index 7e163a3..990a1e0 100644 --- a/OpenSim/Region/Environment/Modules/TerrainModule.cs +++ b/OpenSim/Region/Environment/Modules/Terrain/TerrainModule.cs | |||
@@ -32,11 +32,12 @@ using System.Collections; | |||
32 | using System.Collections.Generic; | 32 | using System.Collections.Generic; |
33 | using OpenSim.Framework; | 33 | using OpenSim.Framework; |
34 | using OpenSim.Framework.Console; | 34 | using OpenSim.Framework.Console; |
35 | using OpenSim.Region.Environment.Modules; | ||
35 | using OpenSim.Region.Environment.Interfaces; | 36 | using OpenSim.Region.Environment.Interfaces; |
36 | using OpenSim.Region.Environment.Scenes; | 37 | using OpenSim.Region.Environment.Scenes; |
37 | using libsecondlife; | 38 | using libsecondlife; |
38 | 39 | ||
39 | namespace OpenSim.Region.Environment.Modules | 40 | namespace OpenSim.Region.Environment.Modules.Terrain |
40 | { | 41 | { |
41 | /// <summary> | 42 | /// <summary> |
42 | /// A new version of the old Channel class, simplified | 43 | /// A new version of the old Channel class, simplified |
diff --git a/OpenSim/Region/Environment/Scenes/SceneBase.cs b/OpenSim/Region/Environment/Scenes/SceneBase.cs index e39fa9f..4e05682 100644 --- a/OpenSim/Region/Environment/Scenes/SceneBase.cs +++ b/OpenSim/Region/Environment/Scenes/SceneBase.cs | |||
@@ -31,6 +31,7 @@ using OpenSim.Framework; | |||
31 | using OpenSim.Framework.Communications.Cache; | 31 | using OpenSim.Framework.Communications.Cache; |
32 | using OpenSim.Framework.Console; | 32 | using OpenSim.Framework.Console; |
33 | using OpenSim.Region.Terrain; | 33 | using OpenSim.Region.Terrain; |
34 | using OpenSim.Region.Environment.Interfaces; | ||
34 | 35 | ||
35 | namespace OpenSim.Region.Environment.Scenes | 36 | namespace OpenSim.Region.Environment.Scenes |
36 | { | 37 | { |
@@ -58,6 +59,7 @@ namespace OpenSim.Region.Environment.Scenes | |||
58 | protected RegionInfo m_regInfo; | 59 | protected RegionInfo m_regInfo; |
59 | 60 | ||
60 | public TerrainEngine Terrain; | 61 | public TerrainEngine Terrain; |
62 | public ITerrainChannel Heightmap; | ||
61 | 63 | ||
62 | protected EventManager m_eventManager; | 64 | protected EventManager m_eventManager; |
63 | 65 | ||