diff options
author | Diva Canto | 2010-12-13 21:36:08 -0800 |
---|---|---|
committer | Diva Canto | 2010-12-13 21:36:08 -0800 |
commit | 4bdba0a48758eff9127c664486df8c02b672f21a (patch) | |
tree | d798cc52162216cf25635ea9efe62c114e9188e5 /OpenSim/Region/ClientStack/LindenUDP | |
parent | This seems to get rid of the stuck PREJUMP animation, as reported by Justin i... (diff) | |
parent | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim (diff) | |
download | opensim-SC-4bdba0a48758eff9127c664486df8c02b672f21a.zip opensim-SC-4bdba0a48758eff9127c664486df8c02b672f21a.tar.gz opensim-SC-4bdba0a48758eff9127c664486df8c02b672f21a.tar.bz2 opensim-SC-4bdba0a48758eff9127c664486df8c02b672f21a.tar.xz |
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
Diffstat (limited to 'OpenSim/Region/ClientStack/LindenUDP')
-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 | } |