remove a dev only conditional on lludp handlers; change parcel lists updates a bit;

2 files changed, 54 insertions, 59 deletions

diff --git a/OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs b/OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs
index ebfc58c..ae7885b 100644
--- a/OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs
+++ b/OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs
@@ -684,17 +684,12 @@ namespace OpenSim.Region.CoreModules.World.Land
         }
 
         public void ClientOnParcelAccessListUpdateRequest(UUID agentID,
-                uint flags, int landLocalID, UUID transactionID, int sequenceID,
-                int sections, List<LandAccessEntry> entries,
+                uint flags, UUID transactionID, int landLocalID, List<LandAccessEntry> entries,
                 IClientAPI remote_client)
         {
-            // Flags is the list to update, it can mean either the ban or
-            // the access list (WTH is a pass list? Mentioned in ParcelFlags)
-            //
-            // There may be multiple packets, because these can get LONG.
-            // Use transactionID to determine a new chain of packets since
-            // packets may have come in out of sequence and that would be
-            // a big mess if using the sequenceID
+            if ((flags & 0x03) == 0)
+                return; // we only have access and ban
+
             ILandObject land;
             lock (m_landList)
             {
@@ -703,15 +698,19 @@ namespace OpenSim.Region.CoreModules.World.Land
 
             if (land != null)
             {
-                GroupPowers requiredPowers = GroupPowers.LandManageAllowed;
-                if (flags == (uint)AccessList.Ban)
-                    requiredPowers = GroupPowers.LandManageBanned;
+                GroupPowers requiredPowers = GroupPowers.None;
+                if ((flags & (uint)AccessList.Access) != 0)
+                    requiredPowers |= GroupPowers.LandManageAllowed;
+                if ((flags & (uint)AccessList.Ban) != 0)
+                    requiredPowers |= GroupPowers.LandManageBanned;
+
+                if(requiredPowers == GroupPowers.None)
+                    return;
 
                 if (m_scene.Permissions.CanEditParcelProperties(agentID,
                         land, requiredPowers, false))
                 {
-                    land.UpdateAccessList(flags, transactionID, sequenceID,
-                            sections, entries, remote_client);
+                    land.UpdateAccessList(flags, transactionID, entries);
                 }
             }
             else
diff --git a/OpenSim/Region/CoreModules/World/Land/LandObject.cs b/OpenSim/Region/CoreModules/World/Land/LandObject.cs
index 2c9ff00..88ca0c6 100644
--- a/OpenSim/Region/CoreModules/World/Land/LandObject.cs
+++ b/OpenSim/Region/CoreModules/World/Land/LandObject.cs
@@ -54,7 +54,8 @@ namespace OpenSim.Region.CoreModules.World.Land
 
         protected Scene m_scene;
         protected List<SceneObjectGroup> primsOverMe = new List<SceneObjectGroup>();
-        protected Dictionary<uint, UUID> m_listTransactions = new Dictionary<uint, UUID>();
+        private Dictionary<uint, UUID> m_listTransactions = new Dictionary<uint, UUID>();
+        private object m_listTransactionsLock = new object();
 
         protected ExpiringCache<UUID, bool> m_groupMemberCache = new ExpiringCache<UUID, bool>();
         protected TimeSpan m_groupMemberCacheTimeout = TimeSpan.FromSeconds(30);  // cache invalidation after 30 seconds
@@ -869,66 +870,61 @@ namespace OpenSim.Region.CoreModules.World.Land
             }
         }
 
-        public void UpdateAccessList(uint flags, UUID transactionID,
-                int sequenceID, int sections,
-                List<LandAccessEntry> entries,
-                IClientAPI remote_client)
+        public void UpdateAccessList(uint flags, UUID transactionID, List<LandAccessEntry> entries)
         {
-            LandData newData = LandData.Copy();
-
-            if ((!m_listTransactions.ContainsKey(flags)) ||
-                    m_listTransactions[flags] != transactionID)
-            {
-                m_listTransactions[flags] = transactionID;
-
-                List<LandAccessEntry> toRemove =
-                        new List<LandAccessEntry>();
-
-                foreach (LandAccessEntry entry in newData.ParcelAccessList)
-                {
-                    if (entry.Flags == (AccessList)flags)
-                        toRemove.Add(entry);
-                }
+            if((flags & 0x03) == 0)
+                return; // we only have access and ban
 
-                foreach (LandAccessEntry entry in toRemove)
-                {
-                    newData.ParcelAccessList.Remove(entry);
-                }
+            flags &=0x03 ;
+            // get a work copy of lists
+            List<LandAccessEntry> parcelAccessList = new List<LandAccessEntry>(LandData.ParcelAccessList);
 
-                // Checked here because this will always be the first
-                // and only packet in a transaction
-                if (entries.Count == 1 && entries[0].AgentID == UUID.Zero)
+            // first packet on a transaction clears before adding
+            // we need to this way because viewer protocol does not seem reliable
+            lock (m_listTransactionsLock)
+            {
+                if ((!m_listTransactions.ContainsKey(flags)) ||
+                                    m_listTransactions[flags] != transactionID)
                 {
-                    m_scene.LandChannel.UpdateLandObject(LandData.LocalID, newData);
+                    m_listTransactions[flags] = transactionID;
+                    List<LandAccessEntry> toRemove = new List<LandAccessEntry>();
+                    foreach (LandAccessEntry entry in parcelAccessList)
+                    {
+                        if (((uint)entry.Flags & flags) != 0)
+                            toRemove.Add(entry);
+                    }
+                    foreach (LandAccessEntry entry in toRemove)
+                        parcelAccessList.Remove(entry);
 
-                    return;
+                    // a delete all command ?
+                    if (entries.Count == 1 && entries[0].AgentID == UUID.Zero)
+                    {
+                        LandData.ParcelAccessList = parcelAccessList;
+                        if ((flags & (uint)AccessList.Access) != 0)
+                            LandData.Flags &= ~(uint)ParcelFlags.UseAccessList;
+                        if ((flags & (uint)AccessList.Ban) != 0)
+                            LandData.Flags &= ~(uint)ParcelFlags.UseBanList;
+                        m_listTransactions.Remove(flags);
+                        return;
+                    }
                 }
             }
 
             foreach (LandAccessEntry entry in entries)
             {
-                LandAccessEntry temp =
-                        new LandAccessEntry();
-
+                LandAccessEntry temp = new LandAccessEntry();
                 temp.AgentID = entry.AgentID;
                 temp.Expires = entry.Expires;
                 temp.Flags = (AccessList)flags;
 
-                newData.ParcelAccessList.Add(temp);
+                parcelAccessList.Add(temp);
             }
 
-            // update use lists flags
-            // rights already checked or we wont be here
-            uint parcelflags = newData.Flags;
-
-            if((flags & (uint)AccessList.Access) != 0)
-                    parcelflags |= (uint)ParcelFlags.UseAccessList;
-            if((flags & (uint)AccessList.Ban) != 0)
-                parcelflags |= (uint)ParcelFlags.UseBanList;
-
-            newData.Flags = parcelflags;
-
-            m_scene.LandChannel.UpdateLandObject(LandData.LocalID, newData);
+            LandData.ParcelAccessList = parcelAccessList;
+            if ((flags & (uint)AccessList.Access) != 0)
+                LandData.Flags |= (uint)ParcelFlags.UseAccessList;
+            if ((flags & (uint)AccessList.Ban) != 0)
+                LandData.Flags |= (uint)ParcelFlags.UseBanList;
         }
 
         #endregion