aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Environment/Scenes
diff options
context:
space:
mode:
authorAdam Frisby2008-03-05 00:52:35 +0000
committerAdam Frisby2008-03-05 00:52:35 +0000
commitf64611862a46c91f416134146cb53fa720a96ec5 (patch)
tree5032b3c6e85254ec62540f76f7921e47b1f7fb62 /OpenSim/Region/Environment/Scenes
parentonce more on hgignore, now that I think I understand this (diff)
downloadopensim-SC-f64611862a46c91f416134146cb53fa720a96ec5.zip
opensim-SC-f64611862a46c91f416134146cb53fa720a96ec5.tar.gz
opensim-SC-f64611862a46c91f416134146cb53fa720a96ec5.tar.bz2
opensim-SC-f64611862a46c91f416134146cb53fa720a96ec5.tar.xz
* New Terrain Module (disabled, search for 'usingTerrainModule = false' to reenable)
* *Much* faster terraforming (woot!) * New "Brushes" design, so you can create custom terraforming brushes then apply those inplace of the standard tools. (ie an Erode Brush for example) * New specialised "Flood Brushes" to do large area effects, ie, raise-area, now takes a bitmap rather than repeats the ordinary raise brush a thousand times. * New modular file Load/Save systems -- write importers/exporters for multiple formats without having to hard code the whole thing in. * Coming soon - effects system, ie the old Erosion functions, etc. for one-shot effects.
Diffstat (limited to 'OpenSim/Region/Environment/Scenes')
-rw-r--r--OpenSim/Region/Environment/Scenes/Scene.cs2
-rw-r--r--OpenSim/Region/Environment/Scenes/SceneBase.cs2
2 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Region/Environment/Scenes/Scene.cs b/OpenSim/Region/Environment/Scenes/Scene.cs
index 1b1549e..ccdd096 100644
--- a/OpenSim/Region/Environment/Scenes/Scene.cs
+++ b/OpenSim/Region/Environment/Scenes/Scene.cs
@@ -869,7 +869,7 @@ namespace OpenSim.Region.Environment.Scenes
869 869
870 public void SendTerrainUpdate(bool checkForTainted) 870 public void SendTerrainUpdate(bool checkForTainted)
871 { 871 {
872 float[] terData = Terrain.GetHeights1D(); 872 float[] terData = Heightmap.GetFloatsSerialised();
873 873
874 Broadcast(delegate(IClientAPI client) 874 Broadcast(delegate(IClientAPI client)
875 { 875 {
diff --git a/OpenSim/Region/Environment/Scenes/SceneBase.cs b/OpenSim/Region/Environment/Scenes/SceneBase.cs
index 9ee5e0e..2a2dea1 100644
--- a/OpenSim/Region/Environment/Scenes/SceneBase.cs
+++ b/OpenSim/Region/Environment/Scenes/SceneBase.cs
@@ -112,7 +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 = true; 115 bool usingTerrainModule = false;
116 116
117 if (usingTerrainModule) 117 if (usingTerrainModule)
118 { 118 {