aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorUbitUmarov2019-11-10 21:12:52 +0000
committerUbitUmarov2019-11-10 21:12:52 +0000
commit38a77a8bb592807fbd6176686fe26c1cdf88b4fd (patch)
tree218d19ca9a4762c6b8b7a27df2e806349e1ff037
parentSIO_UDP_CONNRESET should work on macs now, thx Gavin (diff)
downloadopensim-SC-38a77a8bb592807fbd6176686fe26c1cdf88b4fd.zip
opensim-SC-38a77a8bb592807fbd6176686fe26c1cdf88b4fd.tar.gz
opensim-SC-38a77a8bb592807fbd6176686fe26c1cdf88b4fd.tar.bz2
opensim-SC-38a77a8bb592807fbd6176686fe26c1cdf88b4fd.tar.xz
terraforming changes: try recover llmodifyland previus behaviur
-rwxr-xr-xOpenSim/Region/CoreModules/World/Terrain/TerrainModule.cs8
1 files changed, 5 insertions, 3 deletions
diff --git a/OpenSim/Region/CoreModules/World/Terrain/TerrainModule.cs b/OpenSim/Region/CoreModules/World/Terrain/TerrainModule.cs
index 3cc7289..9e7237b 100755
--- a/OpenSim/Region/CoreModules/World/Terrain/TerrainModule.cs
+++ b/OpenSim/Region/CoreModules/World/Terrain/TerrainModule.cs
@@ -517,9 +517,11 @@ namespace OpenSim.Region.CoreModules.World.Terrain
517 public void ModifyTerrain(UUID user, Vector3 pos, byte size, byte action) 517 public void ModifyTerrain(UUID user, Vector3 pos, byte size, byte action)
518 { 518 {
519 float duration = 0.25f; 519 float duration = 0.25f;
520 float brushSize = size + 1; 520 float brushSize;
521 if (brushSize > 2) 521 if(action == (byte)StandardTerrainEffects.Lower || action == (byte)StandardTerrainEffects.Raise)
522 brushSize = 4; 522 brushSize = (int)(Math.Pow(2, size) + 0.5);
523 else
524 brushSize = (size + 1) * 1.35f;
523 525
524 client_OnModifyTerrain(user, pos.Z, duration, brushSize, action, pos.Y, pos.X, pos.Y, pos.X, -1); 526 client_OnModifyTerrain(user, pos.Z, duration, brushSize, action, pos.Y, pos.X, pos.Y, pos.X, -1);
525 } 527 }