aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/ClientStack/LindenUDP
diff options
context:
space:
mode:
authorMelanie2011-04-17 18:42:06 +0200
committerMelanie2011-04-17 18:42:06 +0200
commitc02e0e930d078ab5e2d4070df65c3d74f5812cbc (patch)
treeabb12e192cf0675b675d874eb86b65aa4fd177d7 /OpenSim/Region/ClientStack/LindenUDP
parentFix the cert validation handler so that it will not block other parts of (diff)
parentMerge branch 'master' into careminster-presence-refactor (diff)
downloadopensim-SC_OLD-c02e0e930d078ab5e2d4070df65c3d74f5812cbc.zip
opensim-SC_OLD-c02e0e930d078ab5e2d4070df65c3d74f5812cbc.tar.gz
opensim-SC_OLD-c02e0e930d078ab5e2d4070df65c3d74f5812cbc.tar.bz2
opensim-SC_OLD-c02e0e930d078ab5e2d4070df65c3d74f5812cbc.tar.xz
Merge branch 'careminster-presence-refactor' of ssh://3dhosting.de/var/git/careminster into careminster-presence-refactor
Diffstat (limited to 'OpenSim/Region/ClientStack/LindenUDP')
-rw-r--r--OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs9
1 files changed, 8 insertions, 1 deletions
diff --git a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
index 4abb6e2..e72159c 100644
--- a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
+++ b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
@@ -4351,6 +4351,8 @@ namespace OpenSim.Region.ClientStack.LindenUDP
4351 4351
4352 public void SendEstateCovenantInformation(UUID covenant) 4352 public void SendEstateCovenantInformation(UUID covenant)
4353 { 4353 {
4354// m_log.DebugFormat("[LLCLIENTVIEW]: Sending estate covenant asset id of {0} to {1}", covenant, Name);
4355
4354 EstateCovenantReplyPacket einfopack = new EstateCovenantReplyPacket(); 4356 EstateCovenantReplyPacket einfopack = new EstateCovenantReplyPacket();
4355 EstateCovenantReplyPacket.DataBlock edata = new EstateCovenantReplyPacket.DataBlock(); 4357 EstateCovenantReplyPacket.DataBlock edata = new EstateCovenantReplyPacket.DataBlock();
4356 edata.CovenantID = covenant; 4358 edata.CovenantID = covenant;
@@ -4361,8 +4363,13 @@ namespace OpenSim.Region.ClientStack.LindenUDP
4361 OutPacket(einfopack, ThrottleOutPacketType.Task); 4363 OutPacket(einfopack, ThrottleOutPacketType.Task);
4362 } 4364 }
4363 4365
4364 public void SendDetailedEstateData(UUID invoice, string estateName, uint estateID, uint parentEstate, uint estateFlags, uint sunPosition, UUID covenant, string abuseEmail, UUID estateOwner) 4366 public void SendDetailedEstateData(
4367 UUID invoice, string estateName, uint estateID, uint parentEstate, uint estateFlags, uint sunPosition,
4368 UUID covenant, string abuseEmail, UUID estateOwner)
4365 { 4369 {
4370// m_log.DebugFormat(
4371// "[LLCLIENTVIEW]: Sending detailed estate data to {0} with covenant asset id {1}", Name, covenant);
4372
4366 EstateOwnerMessagePacket packet = new EstateOwnerMessagePacket(); 4373 EstateOwnerMessagePacket packet = new EstateOwnerMessagePacket();
4367 packet.MethodData.Invoice = invoice; 4374 packet.MethodData.Invoice = invoice;
4368 packet.AgentData.TransactionID = UUID.Random(); 4375 packet.AgentData.TransactionID = UUID.Random();