*Added new commands ('backup','show parcels','reset parcels')

*Added parcel join support
*Made parcel saving and loading much more efficient
*Fixed bug that would not allow joining of parcel locally in the viewer (gives an error before sending to server)
*Known Issue: Restoring parcels from storage is not working correctly. For now, do a 'reset parcels' to regenerate a standard parcel

1 files changed, 5 insertions, 0 deletions

diff --git a/OpenSim/OpenSim.RegionServer/ClientView.ProcessPackets.cs b/OpenSim/OpenSim.RegionServer/ClientView.ProcessPackets.cs
index 2a75205..e329f09 100644
--- a/OpenSim/OpenSim.RegionServer/ClientView.ProcessPackets.cs
+++ b/OpenSim/OpenSim.RegionServer/ClientView.ProcessPackets.cs
@@ -85,6 +85,7 @@ namespace OpenSim
         public event StatusChange OnChildAgentStatus;

         public event ParcelPropertiesRequest OnParcelPropertiesRequest;

         public event ParcelDivideRequest OnParcelDivideRequest;

+        public event ParcelJoinRequest OnParcelJoinRequest;

 

         protected override void ProcessInPacket(Packet Pack)

         {

@@ -477,6 +478,10 @@ namespace OpenSim
                         ParcelDividePacket parcelDivide = (ParcelDividePacket)Pack;

                         OnParcelDivideRequest((int)Math.Round(parcelDivide.ParcelData.West), (int)Math.Round(parcelDivide.ParcelData.South), (int)Math.Round(parcelDivide.ParcelData.East), (int)Math.Round(parcelDivide.ParcelData.North), this);

                         break;

+                    case PacketType.ParcelJoin:

+                        ParcelJoinPacket parcelJoin = (ParcelJoinPacket)Pack;

+                        OnParcelJoinRequest((int)Math.Round(parcelJoin.ParcelData.West), (int)Math.Round(parcelJoin.ParcelData.South), (int)Math.Round(parcelJoin.ParcelData.East), (int)Math.Round(parcelJoin.ParcelData.North), this);

+                        break;

                     #endregion

 

                     #region unimplemented handlers