diff options
author | Melanie | 2011-04-17 18:48:53 +0100 |
---|---|---|
committer | Melanie | 2011-04-17 18:48:53 +0100 |
commit | 474910c9d624b53c010232ddb32b4002f58f1de0 (patch) | |
tree | 45ddab37c6afa0b095ffa0503640b9fe235bc400 /OpenSim/Region/ClientStack | |
parent | Merge branch 'master' into careminster-presence-refactor (diff) | |
parent | More descriptive debug msg for ServiceOSDRequest failures. (diff) | |
download | opensim-SC-474910c9d624b53c010232ddb32b4002f58f1de0.zip opensim-SC-474910c9d624b53c010232ddb32b4002f58f1de0.tar.gz opensim-SC-474910c9d624b53c010232ddb32b4002f58f1de0.tar.bz2 opensim-SC-474910c9d624b53c010232ddb32b4002f58f1de0.tar.xz |
Merge branch 'master' into careminster-presence-refactor
Diffstat (limited to 'OpenSim/Region/ClientStack')
-rw-r--r-- | OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs index 5b2484d..bdb73ad 100644 --- a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs +++ b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs | |||
@@ -4394,6 +4394,8 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
4394 | 4394 | ||
4395 | public void SendEstateCovenantInformation(UUID covenant) | 4395 | public void SendEstateCovenantInformation(UUID covenant) |
4396 | { | 4396 | { |
4397 | // m_log.DebugFormat("[LLCLIENTVIEW]: Sending estate covenant asset id of {0} to {1}", covenant, Name); | ||
4398 | |||
4397 | EstateCovenantReplyPacket einfopack = new EstateCovenantReplyPacket(); | 4399 | EstateCovenantReplyPacket einfopack = new EstateCovenantReplyPacket(); |
4398 | EstateCovenantReplyPacket.DataBlock edata = new EstateCovenantReplyPacket.DataBlock(); | 4400 | EstateCovenantReplyPacket.DataBlock edata = new EstateCovenantReplyPacket.DataBlock(); |
4399 | edata.CovenantID = covenant; | 4401 | edata.CovenantID = covenant; |
@@ -4404,8 +4406,13 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
4404 | OutPacket(einfopack, ThrottleOutPacketType.Task); | 4406 | OutPacket(einfopack, ThrottleOutPacketType.Task); |
4405 | } | 4407 | } |
4406 | 4408 | ||
4407 | public void SendDetailedEstateData(UUID invoice, string estateName, uint estateID, uint parentEstate, uint estateFlags, uint sunPosition, UUID covenant, string abuseEmail, UUID estateOwner) | 4409 | public void SendDetailedEstateData( |
4410 | UUID invoice, string estateName, uint estateID, uint parentEstate, uint estateFlags, uint sunPosition, | ||
4411 | UUID covenant, string abuseEmail, UUID estateOwner) | ||
4408 | { | 4412 | { |
4413 | // m_log.DebugFormat( | ||
4414 | // "[LLCLIENTVIEW]: Sending detailed estate data to {0} with covenant asset id {1}", Name, covenant); | ||
4415 | |||
4409 | EstateOwnerMessagePacket packet = new EstateOwnerMessagePacket(); | 4416 | EstateOwnerMessagePacket packet = new EstateOwnerMessagePacket(); |
4410 | packet.MethodData.Invoice = invoice; | 4417 | packet.MethodData.Invoice = invoice; |
4411 | packet.AgentData.TransactionID = UUID.Random(); | 4418 | packet.AgentData.TransactionID = UUID.Random(); |