*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, 3 deletions

diff --git a/OpenSim/OpenSim.RegionServer/world/World.cs b/OpenSim/OpenSim.RegionServer/world/World.cs
index 0eea039..8b26ecd 100644
--- a/OpenSim/OpenSim.RegionServer/world/World.cs
+++ b/OpenSim/OpenSim.RegionServer/world/World.cs
@@ -282,10 +282,11 @@ namespace OpenSim.world
                 

                 //Parcel backup routines. Yay!

                 ParcelData[] parcels = new ParcelData[parcelManager.parcelList.Count];

-                int i;

-                for (i = 0; i < parcelManager.parcelList.Count; i++)

+                int i = 0;

+                foreach(OpenSim.RegionServer.world.Parcel parcel in parcelManager.parcelList.Values)

                 {

-                    parcels[i] = parcelManager.parcelList[OpenSim.RegionServer.world.ParcelManager.START_PARCEL_LOCAL_ID + i].parcelData;

+                    parcels[i] = parcel.parcelData;

+                    i++;

                 }

                 localStorage.SaveParcels(parcels);

 

@@ -616,6 +617,7 @@ namespace OpenSim.world
 

             agentClient.OnParcelPropertiesRequest += new OpenSim.RegionServer.world.ParcelPropertiesRequest(ParcelPropertiesRequest);

             agentClient.OnParcelDivideRequest += new OpenSim.RegionServer.world.ParcelDivideRequest(ParcelDivideRequest);

+            agentClient.OnParcelJoinRequest+=new OpenSim.RegionServer.world.ParcelJoinRequest(ParcelJoinRequest);

             Avatar newAvatar = null;

             try

             {