aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
diff options
context:
space:
mode:
authorMelanie2010-12-13 20:20:02 +0000
committerMelanie2010-12-13 20:20:02 +0000
commit7538926292ba3380f71f7fb3c004113dd2a92f95 (patch)
tree02619821cdb7207b6aae26c01ce6ca29d58ce452 /OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
parentMerge branch 'master' into careminster-presence-refactor (diff)
parentRevamp the viewer -> banlist packet processing so fix a number of bugs. (diff)
downloadopensim-SC-7538926292ba3380f71f7fb3c004113dd2a92f95.zip
opensim-SC-7538926292ba3380f71f7fb3c004113dd2a92f95.tar.gz
opensim-SC-7538926292ba3380f71f7fb3c004113dd2a92f95.tar.bz2
opensim-SC-7538926292ba3380f71f7fb3c004113dd2a92f95.tar.xz
Merge branch 'careminster-presence-refactor' of ssh://melanie@3dhosting.de/var/git/careminster into careminster-presence-refactor
Diffstat (limited to 'OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs')
-rw-r--r--OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs10
1 files changed, 7 insertions, 3 deletions
diff --git a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
index 246aaf0..612c0d9 100644
--- a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
+++ b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
@@ -8298,7 +8298,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
8298 ParcelManager.ParcelAccessEntry entry = new ParcelManager.ParcelAccessEntry(); 8298 ParcelManager.ParcelAccessEntry entry = new ParcelManager.ParcelAccessEntry();
8299 entry.AgentID = block.ID; 8299 entry.AgentID = block.ID;
8300 entry.Flags = (AccessList)block.Flags; 8300 entry.Flags = (AccessList)block.Flags;
8301 entry.Time = new DateTime(); 8301 entry.Time = Util.ToDateTime(block.Time);
8302 entries.Add(entry); 8302 entries.Add(entry);
8303 } 8303 }
8304 8304
@@ -8306,8 +8306,12 @@ namespace OpenSim.Region.ClientStack.LindenUDP
8306 if (handlerParcelAccessListUpdateRequest != null) 8306 if (handlerParcelAccessListUpdateRequest != null)
8307 { 8307 {
8308 handlerParcelAccessListUpdateRequest(updatePacket.AgentData.AgentID, 8308 handlerParcelAccessListUpdateRequest(updatePacket.AgentData.AgentID,
8309 updatePacket.AgentData.SessionID, updatePacket.Data.Flags, 8309 updatePacket.Data.Flags,
8310 updatePacket.Data.LocalID, entries, this); 8310 updatePacket.Data.LocalID,
8311 updatePacket.Data.TransactionID,
8312 updatePacket.Data.SequenceID,
8313 updatePacket.Data.Sections,
8314 entries, this);
8311 } 8315 }
8312 return true; 8316 return true;
8313 } 8317 }