From 07c487a28f6ce6d85cf32fba0c2ded724f7b5af7 Mon Sep 17 00:00:00 2001
From: Melanie
Date: Thu, 2 Feb 2012 21:36:45 +0100
Subject: Make ban, eject, freeze and the scripted versions of those work.

---
 OpenSim/Framework/LandData.cs | 19 +++++++++++++------
 1 file changed, 13 insertions(+), 6 deletions(-)

(limited to 'OpenSim/Framework/LandData.cs')

diff --git a/OpenSim/Framework/LandData.cs b/OpenSim/Framework/LandData.cs
index 282a128..27fadfa 100644
--- a/OpenSim/Framework/LandData.cs
+++ b/OpenSim/Framework/LandData.cs
@@ -34,6 +34,13 @@ using OpenMetaverse;
 
 namespace OpenSim.Framework
 {
+    public struct LandAccessEntry
+    {
+        public UUID AgentID;
+        public int Expires;
+        public AccessList Flags;
+    }
+
     /// <summary>
     /// Details of a Parcel of land
     /// </summary>
@@ -73,7 +80,7 @@ namespace OpenSim.Framework
         private string _mediaURL = String.Empty;
         private string _musicURL = String.Empty;
         private UUID _ownerID = UUID.Zero;
-        private List<ParcelManager.ParcelAccessEntry> _parcelAccessList = new List<ParcelManager.ParcelAccessEntry>();
+        private List<LandAccessEntry> _parcelAccessList = new List<LandAccessEntry>();
         private float _passHours = 0;
         private int _passPrice = 0;
         private int _salePrice = 0; //Unemeplemented. Parcels price.
@@ -450,7 +457,7 @@ namespace OpenSim.Framework
         /// <summary>
         /// List of access data for the parcel.  User data, some bitflags, and a time
         /// </summary>
-        public List<ParcelManager.ParcelAccessEntry> ParcelAccessList {
+        public List<LandAccessEntry> ParcelAccessList {
             get {
                 return _parcelAccessList;
             }
@@ -638,12 +645,12 @@ namespace OpenSim.Framework
             landData._simwidePrims = _simwidePrims;
 
             landData._parcelAccessList.Clear();
-            foreach (ParcelManager.ParcelAccessEntry entry in _parcelAccessList)
+            foreach (LandAccessEntry entry in _parcelAccessList)
             {
-                ParcelManager.ParcelAccessEntry newEntry = new ParcelManager.ParcelAccessEntry();
+                LandAccessEntry newEntry = new LandAccessEntry();
                 newEntry.AgentID = entry.AgentID;
                 newEntry.Flags = entry.Flags;
-                newEntry.Time = entry.Time;
+                newEntry.Expires = entry.Expires;
 
                 landData._parcelAccessList.Add(newEntry);
             }
@@ -668,4 +675,4 @@ namespace OpenSim.Framework
             return land;
         }
     }
-}
\ No newline at end of file
+}
-- 
cgit v1.1