* Removed some catch-all-ignores from UDPServer in an attempt to look for #305.

* Minor work towards abstracting terrain.

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;
 using System.Collections.Generic;

 using OpenSim.Framework;

 using OpenSim.Framework.Console;

+using OpenSim.Region.Environment.Modules;

 using OpenSim.Region.Environment.Interfaces;

 using OpenSim.Region.Environment.Scenes;

 using libsecondlife;

 

-namespace OpenSim.Region.Environment.Modules

+namespace OpenSim.Region.Environment.Modules.Terrain

 {

     /// <summary>

     /// 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;
 using OpenSim.Framework.Communications.Cache;
 using OpenSim.Framework.Console;
 using OpenSim.Region.Terrain;
+using OpenSim.Region.Environment.Interfaces;
 
 namespace OpenSim.Region.Environment.Scenes
 {
@@ -58,6 +59,7 @@ namespace OpenSim.Region.Environment.Scenes
         protected RegionInfo m_regInfo;
 
         public TerrainEngine Terrain;
+        public ITerrainChannel Heightmap;
 
         protected EventManager m_eventManager;