aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorAdam Frisby2007-07-25 14:38:10 +0000
committerAdam Frisby2007-07-25 14:38:10 +0000
commit2de8f0ef3d34ab3343964fb960d266cf5f356941 (patch)
tree470f61534566aa91bcbdbc4a35b45e6c779c5f45
parent* Assorted terrain fixes (diff)
downloadopensim-SC_OLD-2de8f0ef3d34ab3343964fb960d266cf5f356941.zip
opensim-SC_OLD-2de8f0ef3d34ab3343964fb960d266cf5f356941.tar.gz
opensim-SC_OLD-2de8f0ef3d34ab3343964fb960d266cf5f356941.tar.bz2
opensim-SC_OLD-2de8f0ef3d34ab3343964fb960d266cf5f356941.tar.xz
* Fixed an issue where Terrain brushes may not update correctly.
-rw-r--r--OpenSim/Region/Environment/Scenes/Scene.PacketHandlers.cs11
-rw-r--r--OpenSim/Region/Terrain.BasicTerrain/libTerrainBSD/Channel/Manipulators/AerobicErosion.cs2
2 files changed, 11 insertions, 2 deletions
diff --git a/OpenSim/Region/Environment/Scenes/Scene.PacketHandlers.cs b/OpenSim/Region/Environment/Scenes/Scene.PacketHandlers.cs
index b5faad5..27def3d 100644
--- a/OpenSim/Region/Environment/Scenes/Scene.PacketHandlers.cs
+++ b/OpenSim/Region/Environment/Scenes/Scene.PacketHandlers.cs
@@ -92,7 +92,16 @@ namespace OpenSim.Region.Environment.Scenes
92 break; 92 break;
93 } 93 }
94 94
95 remoteUser.SendLayerData((int)(west / 16), (int)(north / 16), Terrain.GetHeights1D()); 95 for (int x = 0; x < 16; x++)
96 {
97 for (int y = 0; y < 16; y++)
98 {
99 if (Terrain.Tainted(x * 16, y * 16))
100 {
101 remoteUser.SendLayerData(x, y, Terrain.GetHeights1D());
102 }
103 }
104 }
96 105
97 return; 106 return;
98 } 107 }
diff --git a/OpenSim/Region/Terrain.BasicTerrain/libTerrainBSD/Channel/Manipulators/AerobicErosion.cs b/OpenSim/Region/Terrain.BasicTerrain/libTerrainBSD/Channel/Manipulators/AerobicErosion.cs
index fecb748..589d360 100644
--- a/OpenSim/Region/Terrain.BasicTerrain/libTerrainBSD/Channel/Manipulators/AerobicErosion.cs
+++ b/OpenSim/Region/Terrain.BasicTerrain/libTerrainBSD/Channel/Manipulators/AerobicErosion.cs
@@ -76,7 +76,7 @@ namespace libTerrain
76 /// <param name="lowest">Drop sediment at the lowest point?</param> 76 /// <param name="lowest">Drop sediment at the lowest point?</param>
77 public void AerobicErosion(double windspeed, double pickupTalusMinimum, double dropTalusMinimum, double carry, int rounds, bool lowest, bool usingFluidDynamics) 77 public void AerobicErosion(double windspeed, double pickupTalusMinimum, double dropTalusMinimum, double carry, int rounds, bool lowest, bool usingFluidDynamics)
78 { 78 {
79 bool debugImages = true; 79 bool debugImages = false;
80 80
81 Channel wind = new Channel(w, h) ; 81 Channel wind = new Channel(w, h) ;
82 Channel sediment = new Channel(w, h); 82 Channel sediment = new Channel(w, h);