aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/ClientStack
diff options
context:
space:
mode:
authorMic Bowman2011-04-13 15:41:17 -0700
committerMic Bowman2011-04-13 15:41:17 -0700
commit590d20903c6dd596cb8ae3337065f955bd207b67 (patch)
treef6b60205fd58b03f03c9110a68b2036a3ef075d2 /OpenSim/Region/ClientStack
parentMerge branch 'queuetest' of ssh://opensimulator.org/var/git/opensim into queu... (diff)
parentremove packet monitoring debugging code (diff)
downloadopensim-SC_OLD-590d20903c6dd596cb8ae3337065f955bd207b67.zip
opensim-SC_OLD-590d20903c6dd596cb8ae3337065f955bd207b67.tar.gz
opensim-SC_OLD-590d20903c6dd596cb8ae3337065f955bd207b67.tar.bz2
opensim-SC_OLD-590d20903c6dd596cb8ae3337065f955bd207b67.tar.xz
Merge branch 'testmerge' into queuetest
Conflicts: OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
Diffstat (limited to 'OpenSim/Region/ClientStack')
-rw-r--r--OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs10
1 files changed, 8 insertions, 2 deletions
diff --git a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
index cf04f0d..1f7e66d 100644
--- a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
+++ b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
@@ -4049,7 +4049,6 @@ namespace OpenSim.Region.ClientStack.LindenUDP
4049 ppcnt++; 4049 ppcnt++;
4050 } 4050 }
4051 4051
4052
4053 Int32 fpcnt = 0; 4052 Int32 fpcnt = 0;
4054 Int32 fbcnt = 0; 4053 Int32 fbcnt = 0;
4055 4054
@@ -4298,6 +4297,8 @@ namespace OpenSim.Region.ClientStack.LindenUDP
4298 4297
4299 public void SendEstateCovenantInformation(UUID covenant) 4298 public void SendEstateCovenantInformation(UUID covenant)
4300 { 4299 {
4300// m_log.DebugFormat("[LLCLIENTVIEW]: Sending estate covenant asset id of {0} to {1}", covenant, Name);
4301
4301 EstateCovenantReplyPacket einfopack = new EstateCovenantReplyPacket(); 4302 EstateCovenantReplyPacket einfopack = new EstateCovenantReplyPacket();
4302 EstateCovenantReplyPacket.DataBlock edata = new EstateCovenantReplyPacket.DataBlock(); 4303 EstateCovenantReplyPacket.DataBlock edata = new EstateCovenantReplyPacket.DataBlock();
4303 edata.CovenantID = covenant; 4304 edata.CovenantID = covenant;
@@ -4308,8 +4309,13 @@ namespace OpenSim.Region.ClientStack.LindenUDP
4308 OutPacket(einfopack, ThrottleOutPacketType.Task); 4309 OutPacket(einfopack, ThrottleOutPacketType.Task);
4309 } 4310 }
4310 4311
4311 public void SendDetailedEstateData(UUID invoice, string estateName, uint estateID, uint parentEstate, uint estateFlags, uint sunPosition, UUID covenant, string abuseEmail, UUID estateOwner) 4312 public void SendDetailedEstateData(
4313 UUID invoice, string estateName, uint estateID, uint parentEstate, uint estateFlags, uint sunPosition,
4314 UUID covenant, string abuseEmail, UUID estateOwner)
4312 { 4315 {
4316// m_log.DebugFormat(
4317// "[LLCLIENTVIEW]: Sending detailed estate data to {0} with covenant asset id {1}", Name, covenant);
4318
4313 EstateOwnerMessagePacket packet = new EstateOwnerMessagePacket(); 4319 EstateOwnerMessagePacket packet = new EstateOwnerMessagePacket();
4314 packet.MethodData.Invoice = invoice; 4320 packet.MethodData.Invoice = invoice;
4315 packet.AgentData.TransactionID = UUID.Random(); 4321 packet.AgentData.TransactionID = UUID.Random();