From 128f2b1e1b876e5e10233b6f13a91be9314c3dc9 Mon Sep 17 00:00:00 2001
From: mingchen
Date: Tue, 18 Dec 2007 17:42:02 +0000
Subject: *Parcels and their access lists now store over multiple sessions when
 the datastore is sqlite

---
 OpenSim/Region/Environment/Interfaces/IRegionDataStore.cs |  2 +-
 OpenSim/Region/Environment/LandManagement/LandManager.cs  | 13 ++++++++-----
 2 files changed, 9 insertions(+), 6 deletions(-)

(limited to 'OpenSim/Region/Environment')

diff --git a/OpenSim/Region/Environment/Interfaces/IRegionDataStore.cs b/OpenSim/Region/Environment/Interfaces/IRegionDataStore.cs
index 919cfdc..7c63027 100644
--- a/OpenSim/Region/Environment/Interfaces/IRegionDataStore.cs
+++ b/OpenSim/Region/Environment/Interfaces/IRegionDataStore.cs
@@ -51,7 +51,7 @@ namespace OpenSim.Region.Environment.Interfaces
         double[,] LoadTerrain(LLUUID regionID);
 
         void StoreLandObject(Land Parcel,LLUUID regionUUID);
-        void RemoveLandObject(uint ID, LLUUID regionUUID);
+        void RemoveLandObject(LLUUID globalID);
         List<Framework.LandData> LoadLandObjects(LLUUID regionUUID);
 
         void Shutdown();
diff --git a/OpenSim/Region/Environment/LandManagement/LandManager.cs b/OpenSim/Region/Environment/LandManagement/LandManager.cs
index 11845ae..7904f12 100644
--- a/OpenSim/Region/Environment/LandManagement/LandManager.cs
+++ b/OpenSim/Region/Environment/LandManagement/LandManager.cs
@@ -78,7 +78,7 @@ namespace OpenSim.Region.Environment.LandManagement
 
         #region Events and Triggers
         public delegate void LandObjectAdded(Land newParcel, LLUUID regionUUID);
-        public delegate void LandObjectRemoved(uint localParcelID, LLUUID regionUUID);
+        public delegate void LandObjectRemoved(LLUUID globalID);
 
         public event LandObjectAdded OnLandObjectAdded;
         public event LandObjectRemoved OnLandObjectRemoved;
@@ -90,16 +90,16 @@ namespace OpenSim.Region.Environment.LandManagement
                 OnLandObjectAdded(newParcel, m_scene.RegionInfo.RegionID);
             }
         }
-        public void triggerLandObjectRemoved(uint localParcelID)
+        public void triggerLandObjectRemoved(LLUUID globalID)
         {
             if (OnLandObjectRemoved != null)
             {
-                OnLandObjectRemoved(localParcelID, m_scene.RegionInfo.RegionID);
+                OnLandObjectRemoved(globalID);
             }
         }
         public void triggerLandObjectUpdated(uint localParcelID, Land newParcel)
         {
-            triggerLandObjectRemoved(localParcelID);
+            //triggerLandObjectRemoved(localParcelID);
             triggerLandObjectAdded(newParcel);
         }
 
@@ -217,8 +217,9 @@ namespace OpenSim.Region.Environment.LandManagement
                     }
                 }
             }
+
+            triggerLandObjectRemoved(landList[local_id].landData.globalID);
             landList.Remove(local_id);
-            triggerLandObjectRemoved((uint)local_id);
         }
 
         public void updateLandObject(int local_id, LandData newData)
@@ -250,6 +251,7 @@ namespace OpenSim.Region.Environment.LandManagement
             }
 
             removeLandObject(slave.landData.localID);
+            updateLandObject(master.landData.localID, master.landData);
         }
 
         /// <summary>
@@ -351,6 +353,7 @@ namespace OpenSim.Region.Environment.LandManagement
 
             //Now add the new land object
             Land result = addLandObject(newLand);
+            updateLandObject(startLandObject.landData.localID,startLandObject.landData);
             result.sendLandUpdateToAvatarsOverMe();
 
 
-- 
cgit v1.1