aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/Common
diff options
context:
space:
mode:
authormingchen2007-06-06 18:15:12 +0000
committermingchen2007-06-06 18:15:12 +0000
commit73a36680bd5dacd4f2630c50115ef4c1f10dc387 (patch)
treea628ee922e8cac2e4836b025d986cb5806dd820d /Common
parentChanges: (diff)
downloadopensim-SC_OLD-73a36680bd5dacd4f2630c50115ef4c1f10dc387.zip
opensim-SC_OLD-73a36680bd5dacd4f2630c50115ef4c1f10dc387.tar.gz
opensim-SC_OLD-73a36680bd5dacd4f2630c50115ef4c1f10dc387.tar.bz2
opensim-SC_OLD-73a36680bd5dacd4f2630c50115ef4c1f10dc387.tar.xz
*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
Diffstat (limited to 'Common')
-rw-r--r--Common/OpenSim.Framework/Interfaces/ILocalStorage.cs3
-rw-r--r--Common/OpenSim.Framework/Types/ParcelData.cs7
2 files changed, 10 insertions, 0 deletions
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
46 void SaveMap(float[] heightmap); 46 void SaveMap(float[] heightmap);
47 47
48 void SaveParcels(ParcelData[] parcels); 48 void SaveParcels(ParcelData[] parcels);
49 void SaveParcel(ParcelData parcel);
50 void RemoveParcel(ParcelData parcel);
51 void RemoveAllParcels();
49 void LoadParcels(ILocalStorageParcelReceiver recv); 52 void LoadParcels(ILocalStorageParcelReceiver recv);
50 53
51 void ShutDown(); 54 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
28 public libsecondlife.Parcel.ParcelFlags parcelFlags = libsecondlife.Parcel.ParcelFlags.None; 28 public libsecondlife.Parcel.ParcelFlags parcelFlags = libsecondlife.Parcel.ParcelFlags.None;
29 29
30 public int localID = 0; 30 public int localID = 0;
31 public LLUUID globalID = new LLUUID();
32
33 public ParcelData()
34 {
35 globalID = LLUUID.Random();
36 }
31 37
32 public ParcelData Copy() 38 public ParcelData Copy()
33 { 39 {
@@ -41,6 +47,7 @@ namespace OpenSim.Framework.Types
41 parcelData.category = this.category; 47 parcelData.category = this.category;
42 parcelData.claimDate = this.claimDate; 48 parcelData.claimDate = this.claimDate;
43 parcelData.claimPrice = this.claimPrice; 49 parcelData.claimPrice = this.claimPrice;
50 parcelData.globalID = this.globalID;
44 parcelData.groupID = this.groupID; 51 parcelData.groupID = this.groupID;
45 parcelData.groupPrims = this.groupPrims; 52 parcelData.groupPrims = this.groupPrims;
46 parcelData.isGroupOwned = this.isGroupOwned; 53 parcelData.isGroupOwned = this.isGroupOwned;