diff options
Diffstat (limited to 'OpenSim/Region/Environment/Modules/World/Land')
-rw-r--r-- | OpenSim/Region/Environment/Modules/World/Land/LandChannel.cs | 9 | ||||
-rw-r--r-- | OpenSim/Region/Environment/Modules/World/Land/LandObject.cs | 2 |
2 files changed, 3 insertions, 8 deletions
diff --git a/OpenSim/Region/Environment/Modules/World/Land/LandChannel.cs b/OpenSim/Region/Environment/Modules/World/Land/LandChannel.cs index 02558a9..341412a 100644 --- a/OpenSim/Region/Environment/Modules/World/Land/LandChannel.cs +++ b/OpenSim/Region/Environment/Modules/World/Land/LandChannel.cs | |||
@@ -29,7 +29,6 @@ using System; | |||
29 | using System.Collections.Generic; | 29 | using System.Collections.Generic; |
30 | using Axiom.Math; | 30 | using Axiom.Math; |
31 | using libsecondlife; | 31 | using libsecondlife; |
32 | using libsecondlife.Packets; | ||
33 | using OpenSim.Framework; | 32 | using OpenSim.Framework; |
34 | using OpenSim.Region.Environment.Interfaces; | 33 | using OpenSim.Region.Environment.Interfaces; |
35 | using OpenSim.Region.Environment.Scenes; | 34 | using OpenSim.Region.Environment.Scenes; |
@@ -521,7 +520,6 @@ namespace OpenSim.Region.Environment.Modules.World.Land | |||
521 | byte[] byteArray = new byte[LAND_BLOCKS_PER_PACKET]; | 520 | byte[] byteArray = new byte[LAND_BLOCKS_PER_PACKET]; |
522 | int byteArrayCount = 0; | 521 | int byteArrayCount = 0; |
523 | int sequenceID = 0; | 522 | int sequenceID = 0; |
524 | ParcelOverlayPacket packet; | ||
525 | 523 | ||
526 | int y; | 524 | int y; |
527 | for (y = 0; y < 64; y++) | 525 | for (y = 0; y < 64; y++) |
@@ -595,11 +593,8 @@ namespace OpenSim.Region.Environment.Modules.World.Land | |||
595 | byteArrayCount++; | 593 | byteArrayCount++; |
596 | if (byteArrayCount >= LAND_BLOCKS_PER_PACKET) | 594 | if (byteArrayCount >= LAND_BLOCKS_PER_PACKET) |
597 | { | 595 | { |
598 | byteArrayCount = 0; | 596 | remote_client.sendLandParcelOverlay(byteArray, sequenceID); |
599 | packet = (ParcelOverlayPacket) PacketPool.Instance.GetPacket(PacketType.ParcelOverlay); | 597 | byteArrayCount = 0; |
600 | packet.ParcelData.Data = byteArray; | ||
601 | packet.ParcelData.SequenceID = sequenceID; | ||
602 | remote_client.OutPacket(packet, ThrottleOutPacketType.Task); | ||
603 | sequenceID++; | 598 | sequenceID++; |
604 | byteArray = new byte[LAND_BLOCKS_PER_PACKET]; | 599 | byteArray = new byte[LAND_BLOCKS_PER_PACKET]; |
605 | } | 600 | } |
diff --git a/OpenSim/Region/Environment/Modules/World/Land/LandObject.cs b/OpenSim/Region/Environment/Modules/World/Land/LandObject.cs index 88bc4e6..2d3359c 100644 --- a/OpenSim/Region/Environment/Modules/World/Land/LandObject.cs +++ b/OpenSim/Region/Environment/Modules/World/Land/LandObject.cs | |||
@@ -122,7 +122,7 @@ namespace OpenSim.Region.Environment.Modules.World.Land | |||
122 | 122 | ||
123 | public void sendLandProperties(int sequence_id, bool snap_selection, int request_result, IClientAPI remote_client) | 123 | public void sendLandProperties(int sequence_id, bool snap_selection, int request_result, IClientAPI remote_client) |
124 | { | 124 | { |
125 | remote_client.sendLandProperties(remote_client, sequence_id, snap_selection, request_result, landData, m_scene.RegionInfo.EstateSettings.objectBonusFactor, m_scene.objectCapacity); | 125 | remote_client.sendLandProperties(remote_client, sequence_id, snap_selection, request_result, landData, m_scene.RegionInfo.EstateSettings.objectBonusFactor, m_scene.objectCapacity,(uint) m_scene.RegionInfo.EstateSettings.regionFlags); |
126 | } | 126 | } |
127 | 127 | ||
128 | public void updateLandProperties(LandUpdateArgs args, IClientAPI remote_client) | 128 | public void updateLandProperties(LandUpdateArgs args, IClientAPI remote_client) |