aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorTeravus Ovares2007-12-15 17:10:12 +0000
committerTeravus Ovares2007-12-15 17:10:12 +0000
commite3dd15bef05bbe53b3dac44c320e4182ce7feb68 (patch)
tree38b93ee4a8aa88113588f91f6940b3358146ee34
parentThanks again to Alondria for adding: math support for (diff)
downloadopensim-SC_OLD-e3dd15bef05bbe53b3dac44c320e4182ce7feb68.zip
opensim-SC_OLD-e3dd15bef05bbe53b3dac44c320e4182ce7feb68.tar.gz
opensim-SC_OLD-e3dd15bef05bbe53b3dac44c320e4182ce7feb68.tar.bz2
opensim-SC_OLD-e3dd15bef05bbe53b3dac44c320e4182ce7feb68.tar.xz
* Added support for multiple terrain blocks to be edited at the same time
* Now sending South and East cords to the terrain editor.. * No new functionality from a user perspective * Programming wise, there's enough information to get the select based terrain editor working in an upcoming revision.
-rw-r--r--OpenSim/Framework/IClientAPI.cs2
-rw-r--r--OpenSim/Region/ClientStack/ClientView.cs11
-rw-r--r--OpenSim/Region/Environment/Scenes/Scene.PacketHandlers.cs2
3 files changed, 9 insertions, 6 deletions
diff --git a/OpenSim/Framework/IClientAPI.cs b/OpenSim/Framework/IClientAPI.cs
index c34fb93..62a97e5 100644
--- a/OpenSim/Framework/IClientAPI.cs
+++ b/OpenSim/Framework/IClientAPI.cs
@@ -229,7 +229,7 @@ namespace OpenSim.Framework
229 public delegate void RezObject(IClientAPI remoteClient, LLUUID itemID, LLVector3 pos); 229 public delegate void RezObject(IClientAPI remoteClient, LLUUID itemID, LLVector3 pos);
230 230
231 public delegate void ModifyTerrain( 231 public delegate void ModifyTerrain(
232 float height, float seconds, byte size, byte action, float north, float west, IClientAPI remoteClient); 232 float height, float seconds, byte size, byte action, float north, float west, float south, float east, IClientAPI remoteClient);
233 233
234 public delegate void SetAppearance(byte[] texture, AgentSetAppearancePacket.VisualParamBlock[] visualParam); 234 public delegate void SetAppearance(byte[] texture, AgentSetAppearancePacket.VisualParamBlock[] visualParam);
235 235
diff --git a/OpenSim/Region/ClientStack/ClientView.cs b/OpenSim/Region/ClientStack/ClientView.cs
index dffcd73..065e5e0 100644
--- a/OpenSim/Region/ClientStack/ClientView.cs
+++ b/OpenSim/Region/ClientStack/ClientView.cs
@@ -2453,10 +2453,13 @@ namespace OpenSim.Region.ClientStack
2453 { 2453 {
2454 if (OnModifyTerrain != null) 2454 if (OnModifyTerrain != null)
2455 { 2455 {
2456 OnModifyTerrain(modify.ModifyBlock.Height, modify.ModifyBlock.Seconds, 2456 for (int i=0; i < modify.ParcelData.Length; i++)
2457 modify.ModifyBlock.BrushSize, 2457 {
2458 modify.ModifyBlock.Action, modify.ParcelData[0].North, 2458 OnModifyTerrain(modify.ModifyBlock.Height, modify.ModifyBlock.Seconds,
2459 modify.ParcelData[0].West, this); 2459 modify.ModifyBlock.BrushSize,
2460 modify.ModifyBlock.Action, modify.ParcelData[i].North,
2461 modify.ParcelData[i].West, modify.ParcelData[i].South, modify.ParcelData[i].East, this);
2462 }
2460 } 2463 }
2461 } 2464 }
2462 break; 2465 break;
diff --git a/OpenSim/Region/Environment/Scenes/Scene.PacketHandlers.cs b/OpenSim/Region/Environment/Scenes/Scene.PacketHandlers.cs
index 07e5362..ce77527 100644
--- a/OpenSim/Region/Environment/Scenes/Scene.PacketHandlers.cs
+++ b/OpenSim/Region/Environment/Scenes/Scene.PacketHandlers.cs
@@ -45,7 +45,7 @@ namespace OpenSim.Region.Environment.Scenes
45 /// <param name="action">The action to be performed</param> 45 /// <param name="action">The action to be performed</param>
46 /// <param name="north">Distance from the north border where the cursor is located</param> 46 /// <param name="north">Distance from the north border where the cursor is located</param>
47 /// <param name="west">Distance from the west border where the cursor is located</param> 47 /// <param name="west">Distance from the west border where the cursor is located</param>
48 public void ModifyTerrain(float height, float seconds, byte brushsize, byte action, float north, float west, 48 public void ModifyTerrain(float height, float seconds, byte brushsize, byte action, float north, float west, float south, float east,
49 IClientAPI remoteUser) 49 IClientAPI remoteUser)
50 { 50 {
51 // Do a permissions check before allowing terraforming. 51 // Do a permissions check before allowing terraforming.