diff options
author | Dan Lake | 2012-02-02 17:44:11 -0800 |
---|---|---|
committer | Dan Lake | 2012-02-02 17:44:11 -0800 |
commit | 3257dbe76dff0a1e5842cafc75e4c2d09278deab (patch) | |
tree | 7f7d1a58ca910d8acefbd3bee0c3d096a59d8a43 /OpenSim/Region/ClientStack/Linden/UDP | |
parent | ObjectAddedToScene event should be fired when duplicating objects (diff) | |
parent | Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim (diff) | |
download | opensim-SC-3257dbe76dff0a1e5842cafc75e4c2d09278deab.zip opensim-SC-3257dbe76dff0a1e5842cafc75e4c2d09278deab.tar.gz opensim-SC-3257dbe76dff0a1e5842cafc75e4c2d09278deab.tar.bz2 opensim-SC-3257dbe76dff0a1e5842cafc75e4c2d09278deab.tar.xz |
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
Diffstat (limited to 'OpenSim/Region/ClientStack/Linden/UDP')
-rw-r--r-- | OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs | 14 |
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 a7bf06d..cdd4957 100644 --- a/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs +++ b/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs | |||
@@ -4623,7 +4623,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
4623 | } | 4623 | } |
4624 | } | 4624 | } |
4625 | 4625 | ||
4626 | public void SendLandAccessListData(List<UUID> avatars, uint accessFlag, int localLandID) | 4626 | public void SendLandAccessListData(List<LandAccessEntry> accessList, uint accessFlag, int localLandID) |
4627 | { | 4627 | { |
4628 | ParcelAccessListReplyPacket replyPacket = (ParcelAccessListReplyPacket)PacketPool.Instance.GetPacket(PacketType.ParcelAccessListReply); | 4628 | ParcelAccessListReplyPacket replyPacket = (ParcelAccessListReplyPacket)PacketPool.Instance.GetPacket(PacketType.ParcelAccessListReply); |
4629 | replyPacket.Data.AgentID = AgentId; | 4629 | replyPacket.Data.AgentID = AgentId; |
@@ -4632,12 +4632,12 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
4632 | replyPacket.Data.SequenceID = 0; | 4632 | replyPacket.Data.SequenceID = 0; |
4633 | 4633 | ||
4634 | List<ParcelAccessListReplyPacket.ListBlock> list = new List<ParcelAccessListReplyPacket.ListBlock>(); | 4634 | List<ParcelAccessListReplyPacket.ListBlock> list = new List<ParcelAccessListReplyPacket.ListBlock>(); |
4635 | foreach (UUID avatar in avatars) | 4635 | foreach (LandAccessEntry entry in accessList) |
4636 | { | 4636 | { |
4637 | ParcelAccessListReplyPacket.ListBlock block = new ParcelAccessListReplyPacket.ListBlock(); | 4637 | ParcelAccessListReplyPacket.ListBlock block = new ParcelAccessListReplyPacket.ListBlock(); |
4638 | block.Flags = accessFlag; | 4638 | block.Flags = accessFlag; |
4639 | block.ID = avatar; | 4639 | block.ID = entry.AgentID; |
4640 | block.Time = 0; | 4640 | block.Time = entry.Expires; |
4641 | list.Add(block); | 4641 | list.Add(block); |
4642 | } | 4642 | } |
4643 | 4643 | ||
@@ -8577,13 +8577,13 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
8577 | } | 8577 | } |
8578 | #endregion | 8578 | #endregion |
8579 | 8579 | ||
8580 | List<ParcelManager.ParcelAccessEntry> entries = new List<ParcelManager.ParcelAccessEntry>(); | 8580 | List<LandAccessEntry> entries = new List<LandAccessEntry>(); |
8581 | foreach (ParcelAccessListUpdatePacket.ListBlock block in updatePacket.List) | 8581 | foreach (ParcelAccessListUpdatePacket.ListBlock block in updatePacket.List) |
8582 | { | 8582 | { |
8583 | ParcelManager.ParcelAccessEntry entry = new ParcelManager.ParcelAccessEntry(); | 8583 | LandAccessEntry entry = new LandAccessEntry(); |
8584 | entry.AgentID = block.ID; | 8584 | entry.AgentID = block.ID; |
8585 | entry.Flags = (AccessList)block.Flags; | 8585 | entry.Flags = (AccessList)block.Flags; |
8586 | entry.Time = Util.ToDateTime(block.Time); | 8586 | entry.Expires = block.Time; |
8587 | entries.Add(entry); | 8587 | entries.Add(entry); |
8588 | } | 8588 | } |
8589 | 8589 | ||