aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Environment/Scenes/SceneBase.cs
diff options
context:
space:
mode:
authorAdam Frisby2008-03-06 15:49:53 +0000
committerAdam Frisby2008-03-06 15:49:53 +0000
commita3601165029f8484988b5c322798a341ff1e9400 (patch)
tree4b761e7d0694dffb0b67018915fc240e7bbaa154 /OpenSim/Region/Environment/Scenes/SceneBase.cs
parent* Killed 4 more warnings (at 16 now) (diff)
downloadopensim-SC-a3601165029f8484988b5c322798a341ff1e9400.zip
opensim-SC-a3601165029f8484988b5c322798a341ff1e9400.tar.gz
opensim-SC-a3601165029f8484988b5c322798a341ff1e9400.tar.bz2
opensim-SC-a3601165029f8484988b5c322798a341ff1e9400.tar.xz
* Disabled ancient TerrainEngine.
* Enabled new TerrainModule. (The king is dead, long live the king!) * Use the console command: "script terrain save file.r32" / "script terrain load file.r32" to load/save terrain. Now uses the extension to determine file format. * MANY of the old terrain features do not have a replacement function in the new module yet, this needs to be corrected, but has not been done so far. This being said, the new module is faster and more efficient and should be a good replacement.
Diffstat (limited to '')
-rw-r--r--OpenSim/Region/Environment/Scenes/SceneBase.cs13
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