diff options
author | Justin Clark-Casey (justincc) | 2010-12-14 00:12:17 +0000 |
---|---|---|
committer | Justin Clark-Casey (justincc) | 2010-12-14 00:12:17 +0000 |
commit | e08da02a0fe3bcf19c6cc84023e56f81e3b1a7f5 (patch) | |
tree | fc4a33689299573e29ad4bf1e7aa74e821cf68d9 /OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs | |
parent | reinstate IAttachmentsModule.UpdateAttachmentPosition() since this is being u... (diff) | |
parent | Fix a small bug in ban list handling (diff) | |
download | opensim-SC-e08da02a0fe3bcf19c6cc84023e56f81e3b1a7f5.zip opensim-SC-e08da02a0fe3bcf19c6cc84023e56f81e3b1a7f5.tar.gz opensim-SC-e08da02a0fe3bcf19c6cc84023e56f81e3b1a7f5.tar.bz2 opensim-SC-e08da02a0fe3bcf19c6cc84023e56f81e3b1a7f5.tar.xz |
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
Diffstat (limited to 'OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs')
-rw-r--r-- | OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs index f125822..c934b9e 100644 --- a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs +++ b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs | |||
@@ -8239,7 +8239,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
8239 | ParcelManager.ParcelAccessEntry entry = new ParcelManager.ParcelAccessEntry(); | 8239 | ParcelManager.ParcelAccessEntry entry = new ParcelManager.ParcelAccessEntry(); |
8240 | entry.AgentID = block.ID; | 8240 | entry.AgentID = block.ID; |
8241 | entry.Flags = (AccessList)block.Flags; | 8241 | entry.Flags = (AccessList)block.Flags; |
8242 | entry.Time = new DateTime(); | 8242 | entry.Time = Util.ToDateTime(block.Time); |
8243 | entries.Add(entry); | 8243 | entries.Add(entry); |
8244 | } | 8244 | } |
8245 | 8245 | ||
@@ -8247,8 +8247,12 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
8247 | if (handlerParcelAccessListUpdateRequest != null) | 8247 | if (handlerParcelAccessListUpdateRequest != null) |
8248 | { | 8248 | { |
8249 | handlerParcelAccessListUpdateRequest(updatePacket.AgentData.AgentID, | 8249 | handlerParcelAccessListUpdateRequest(updatePacket.AgentData.AgentID, |
8250 | updatePacket.AgentData.SessionID, updatePacket.Data.Flags, | 8250 | updatePacket.Data.Flags, |
8251 | updatePacket.Data.LocalID, entries, this); | 8251 | updatePacket.Data.LocalID, |
8252 | updatePacket.Data.TransactionID, | ||
8253 | updatePacket.Data.SequenceID, | ||
8254 | updatePacket.Data.Sections, | ||
8255 | entries, this); | ||
8252 | } | 8256 | } |
8253 | return true; | 8257 | return true; |
8254 | } | 8258 | } |