aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Environment/Scenes
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim/Region/Environment/Scenes')
-rw-r--r--OpenSim/Region/Environment/Scenes/Scene.cs4
-rw-r--r--OpenSim/Region/Environment/Scenes/SceneBase.cs11
2 files changed, 12 insertions, 3 deletions
diff --git a/OpenSim/Region/Environment/Scenes/Scene.cs b/OpenSim/Region/Environment/Scenes/Scene.cs
index a20e466..845de22 100644
--- a/OpenSim/Region/Environment/Scenes/Scene.cs
+++ b/OpenSim/Region/Environment/Scenes/Scene.cs
@@ -31,14 +31,12 @@ using System.Drawing;
31using System.Drawing.Imaging; 31using System.Drawing.Imaging;
32using System.Threading; 32using System.Threading;
33using System.Timers; 33using System.Timers;
34using Axiom.Math;
35using libsecondlife; 34using libsecondlife;
36using libsecondlife.Packets; 35using libsecondlife.Packets;
37using OpenJPEGNet; 36using OpenJPEGNet;
38using OpenSim.Framework; 37using OpenSim.Framework;
39using OpenSim.Framework.Communications; 38using OpenSim.Framework.Communications;
40using OpenSim.Framework.Communications.Cache; 39using OpenSim.Framework.Communications.Cache;
41using OpenSim.Framework.Console;
42using OpenSim.Framework.Servers; 40using OpenSim.Framework.Servers;
43using OpenSim.Region.Environment.Interfaces; 41using OpenSim.Region.Environment.Interfaces;
44using OpenSim.Region.Environment.LandManagement; 42using OpenSim.Region.Environment.LandManagement;
@@ -1002,6 +1000,8 @@ namespace OpenSim.Region.Environment.Scenes
1002 } 1000 }
1003 else 1001 else
1004 { 1002 {
1003 // TODO: Install 'GetDefaultTerrainProvider' method here?
1004 Heightmap = new Modules.Terrain.TerrainChannel(map);
1005 Terrain.SetHeights2D(map); 1005 Terrain.SetHeights2D(map);
1006 } 1006 }
1007 1007
diff --git a/OpenSim/Region/Environment/Scenes/SceneBase.cs b/OpenSim/Region/Environment/Scenes/SceneBase.cs
index 3f7edfb..2a2dea1 100644
--- a/OpenSim/Region/Environment/Scenes/SceneBase.cs
+++ b/OpenSim/Region/Environment/Scenes/SceneBase.cs
@@ -112,7 +112,16 @@ 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 RemoteClient.SendLayerData(Terrain.GetHeights1D()); 115 bool usingTerrainModule = false;
116
117 if (usingTerrainModule)
118 {
119 RemoteClient.SendLayerData(Heightmap.GetFloatsSerialised());
120 }
121 else
122 {
123 RemoteClient.SendLayerData(Terrain.GetHeights1D());
124 }
116 } 125 }
117 126
118 #endregion 127 #endregion