From 73a36680bd5dacd4f2630c50115ef4c1f10dc387 Mon Sep 17 00:00:00 2001
From: mingchen
Date: Wed, 6 Jun 2007 18:15:12 +0000
Subject: *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

---
 Common/OpenSim.Framework/Interfaces/ILocalStorage.cs | 3 +++
 Common/OpenSim.Framework/Types/ParcelData.cs         | 7 +++++++
 2 files changed, 10 insertions(+)

(limited to 'Common')

diff --git a/Common/OpenSim.Framework/Interfaces/ILocalStorage.cs b/Common/OpenSim.Framework/Interfaces/ILocalStorage.cs
index 9fa3a00..dd17b72 100644
--- a/Common/OpenSim.Framework/Interfaces/ILocalStorage.cs
+++ b/Common/OpenSim.Framework/Interfaces/ILocalStorage.cs
@@ -46,6 +46,9 @@ namespace OpenSim.Framework.Interfaces
         void SaveMap(float[] heightmap);
 
         void SaveParcels(ParcelData[] parcels);
+        void SaveParcel(ParcelData parcel);
+        void RemoveParcel(ParcelData parcel);
+        void RemoveAllParcels();
         void LoadParcels(ILocalStorageParcelReceiver recv);
 
         void ShutDown();
diff --git a/Common/OpenSim.Framework/Types/ParcelData.cs b/Common/OpenSim.Framework/Types/ParcelData.cs
index 7b3a24c..b5c3946 100644
--- a/Common/OpenSim.Framework/Types/ParcelData.cs
+++ b/Common/OpenSim.Framework/Types/ParcelData.cs
@@ -28,6 +28,12 @@ namespace OpenSim.Framework.Types
             public libsecondlife.Parcel.ParcelFlags parcelFlags = libsecondlife.Parcel.ParcelFlags.None;
 
             public int localID = 0;
+            public LLUUID globalID = new LLUUID();
+
+            public ParcelData()
+            {
+                globalID = LLUUID.Random();
+            }
 
             public ParcelData Copy()
             {
@@ -41,6 +47,7 @@ namespace OpenSim.Framework.Types
                 parcelData.category = this.category;
                 parcelData.claimDate = this.claimDate;
                 parcelData.claimPrice = this.claimPrice;
+                parcelData.globalID = this.globalID;
                 parcelData.groupID = this.groupID;
                 parcelData.groupPrims = this.groupPrims;
                 parcelData.isGroupOwned = this.isGroupOwned;
-- 
cgit v1.1