diff options
Diffstat (limited to 'OpenSim/Region/Environment/Scenes/SceneBase.cs')
-rw-r--r-- | OpenSim/Region/Environment/Scenes/SceneBase.cs | 13 |
1 files changed, 2 insertions, 11 deletions
diff --git a/OpenSim/Region/Environment/Scenes/SceneBase.cs b/OpenSim/Region/Environment/Scenes/SceneBase.cs index 2a2dea1..12635c8 100644 --- a/OpenSim/Region/Environment/Scenes/SceneBase.cs +++ b/OpenSim/Region/Environment/Scenes/SceneBase.cs | |||
@@ -58,7 +58,7 @@ namespace OpenSim.Region.Environment.Scenes | |||
58 | protected string m_regionName; | 58 | protected string m_regionName; |
59 | protected RegionInfo m_regInfo; | 59 | protected RegionInfo m_regInfo; |
60 | 60 | ||
61 | public TerrainEngine Terrain; | 61 | //public TerrainEngine Terrain; |
62 | public ITerrainChannel Heightmap; | 62 | public ITerrainChannel Heightmap; |
63 | 63 | ||
64 | protected EventManager m_eventManager; | 64 | protected EventManager m_eventManager; |
@@ -112,16 +112,7 @@ namespace OpenSim.Region.Environment.Scenes | |||
112 | /// <param name="RemoteClient">Client to send to</param> | 112 | /// <param name="RemoteClient">Client to send to</param> |
113 | public virtual void SendLayerData(IClientAPI RemoteClient) | 113 | public virtual void SendLayerData(IClientAPI RemoteClient) |
114 | { | 114 | { |
115 | bool usingTerrainModule = false; | 115 | RemoteClient.SendLayerData(Heightmap.GetFloatsSerialised()); |
116 | |||
117 | if (usingTerrainModule) | ||
118 | { | ||
119 | RemoteClient.SendLayerData(Heightmap.GetFloatsSerialised()); | ||
120 | } | ||
121 | else | ||
122 | { | ||
123 | RemoteClient.SendLayerData(Terrain.GetHeights1D()); | ||
124 | } | ||
125 | } | 116 | } |
126 | 117 | ||
127 | #endregion | 118 | #endregion |