aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/ClientStack/Linden
diff options
context:
space:
mode:
authorMelanie2012-02-02 21:36:45 +0100
committerMelanie2012-02-02 21:36:45 +0100
commit07c487a28f6ce6d85cf32fba0c2ded724f7b5af7 (patch)
tree7852ae5fa1c6a9d91f6c5b7930615a45245b694e /OpenSim/Region/ClientStack/Linden
parentStreamline banning code using existing methods. (diff)
downloadopensim-SC_OLD-07c487a28f6ce6d85cf32fba0c2ded724f7b5af7.zip
opensim-SC_OLD-07c487a28f6ce6d85cf32fba0c2ded724f7b5af7.tar.gz
opensim-SC_OLD-07c487a28f6ce6d85cf32fba0c2ded724f7b5af7.tar.bz2
opensim-SC_OLD-07c487a28f6ce6d85cf32fba0c2ded724f7b5af7.tar.xz
Make ban, eject, freeze and the scripted versions of those work.
Diffstat (limited to 'OpenSim/Region/ClientStack/Linden')
-rw-r--r--OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs14
1 files changed, 7 insertions, 7 deletions
diff --git a/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs b/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
index d126f5f..8c0a7e9 100644
--- a/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
+++ b/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
@@ -4684,7 +4684,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
4684 } 4684 }
4685 } 4685 }
4686 4686
4687 public void SendLandAccessListData(List<UUID> avatars, uint accessFlag, int localLandID) 4687 public void SendLandAccessListData(List<LandAccessEntry> accessList, uint accessFlag, int localLandID)
4688 { 4688 {
4689 ParcelAccessListReplyPacket replyPacket = (ParcelAccessListReplyPacket)PacketPool.Instance.GetPacket(PacketType.ParcelAccessListReply); 4689 ParcelAccessListReplyPacket replyPacket = (ParcelAccessListReplyPacket)PacketPool.Instance.GetPacket(PacketType.ParcelAccessListReply);
4690 replyPacket.Data.AgentID = AgentId; 4690 replyPacket.Data.AgentID = AgentId;
@@ -4693,12 +4693,12 @@ namespace OpenSim.Region.ClientStack.LindenUDP
4693 replyPacket.Data.SequenceID = 0; 4693 replyPacket.Data.SequenceID = 0;
4694 4694
4695 List<ParcelAccessListReplyPacket.ListBlock> list = new List<ParcelAccessListReplyPacket.ListBlock>(); 4695 List<ParcelAccessListReplyPacket.ListBlock> list = new List<ParcelAccessListReplyPacket.ListBlock>();
4696 foreach (UUID avatar in avatars) 4696 foreach (LandAccessEntry entry in accessList)
4697 { 4697 {
4698 ParcelAccessListReplyPacket.ListBlock block = new ParcelAccessListReplyPacket.ListBlock(); 4698 ParcelAccessListReplyPacket.ListBlock block = new ParcelAccessListReplyPacket.ListBlock();
4699 block.Flags = accessFlag; 4699 block.Flags = accessFlag;
4700 block.ID = avatar; 4700 block.ID = entry.AgentID;
4701 block.Time = 0; 4701 block.Time = entry.Expires;
4702 list.Add(block); 4702 list.Add(block);
4703 } 4703 }
4704 4704
@@ -8641,13 +8641,13 @@ namespace OpenSim.Region.ClientStack.LindenUDP
8641 } 8641 }
8642 #endregion 8642 #endregion
8643 8643
8644 List<ParcelManager.ParcelAccessEntry> entries = new List<ParcelManager.ParcelAccessEntry>(); 8644 List<LandAccessEntry> entries = new List<LandAccessEntry>();
8645 foreach (ParcelAccessListUpdatePacket.ListBlock block in updatePacket.List) 8645 foreach (ParcelAccessListUpdatePacket.ListBlock block in updatePacket.List)
8646 { 8646 {
8647 ParcelManager.ParcelAccessEntry entry = new ParcelManager.ParcelAccessEntry(); 8647 LandAccessEntry entry = new LandAccessEntry();
8648 entry.AgentID = block.ID; 8648 entry.AgentID = block.ID;
8649 entry.Flags = (AccessList)block.Flags; 8649 entry.Flags = (AccessList)block.Flags;
8650 entry.Time = Util.ToDateTime(block.Time); 8650 entry.Expires = block.Time;
8651 entries.Add(entry); 8651 entries.Add(entry);
8652 } 8652 }
8653 8653