From d845da215f8d30ef3f34a3c207fb892c815d1fac Mon Sep 17 00:00:00 2001
From: mingchen
Date: Mon, 17 Dec 2007 03:49:13 +0000
Subject: *Land has now been linked to the StorageManager. Next step is to fill
 in the functions for the different datastore interfaces for Land Objects.

---
 OpenSim/Framework/Data.MySQL/MySQLDataStore.cs |  8 ++++----
 OpenSim/Framework/LandData.cs                  | 15 ++++++++++++++-
 2 files changed, 18 insertions(+), 5 deletions(-)

(limited to 'OpenSim/Framework')

diff --git a/OpenSim/Framework/Data.MySQL/MySQLDataStore.cs b/OpenSim/Framework/Data.MySQL/MySQLDataStore.cs
index cc799ca..511c8d8 100644
--- a/OpenSim/Framework/Data.MySQL/MySQLDataStore.cs
+++ b/OpenSim/Framework/Data.MySQL/MySQLDataStore.cs
@@ -289,17 +289,17 @@ namespace OpenSim.Framework.Data.MySQL
             return terret;
         }
 
-        public void RemoveLandObject(uint id)
+        public void RemoveLandObject(uint id, LLUUID regionUUID)
         {
         }
 
-        public void StoreParcel(Land parcel)
+        public void StoreLandObject(Land parcel, LLUUID regionUUID)
         {
         }
 
-        public List<Land> LoadLandObjects()
+        public List<Framework.LandData> LoadLandObjects(LLUUID regionUUID)
         {
-            return new List<Land>();
+            return new List<LandData>();
         }
 
         private void DisplayDataSet(DataSet ds, string title)
diff --git a/OpenSim/Framework/LandData.cs b/OpenSim/Framework/LandData.cs
index 8b6c654..e35aa0e 100644
--- a/OpenSim/Framework/LandData.cs
+++ b/OpenSim/Framework/LandData.cs
@@ -26,7 +26,7 @@
 * 
 */
 using libsecondlife;
-
+using System.Collections.Generic;
 namespace OpenSim.Framework
 {
     public class LandData
@@ -74,6 +74,8 @@ namespace OpenSim.Framework
         public LLVector3 userLocation = new LLVector3();
         public LLVector3 userLookAt = new LLVector3();
 
+        public List<ParcelManager.ParcelAccessEntry> parcelAccessList = new List<ParcelManager.ParcelAccessEntry>();
+
         public LandData()
         {
             globalID = LLUUID.Random();
@@ -117,6 +119,17 @@ namespace OpenSim.Framework
             landData.userLocation = userLocation;
             landData.userLookAt = userLookAt;
 
+            landData.parcelAccessList.Clear();
+            foreach (ParcelManager.ParcelAccessEntry entry in parcelAccessList)
+            {
+                ParcelManager.ParcelAccessEntry newEntry = new ParcelManager.ParcelAccessEntry();
+                newEntry.AgentID = entry.AgentID;
+                newEntry.Flags = entry.Flags;
+                newEntry.Time = entry.Time;
+
+                landData.parcelAccessList.Add(newEntry);
+            }
+
             return landData;
         }
     }
-- 
cgit v1.1