diff options
| author | Melanie | 2011-10-12 06:48:40 +0200 |
|---|---|---|
| committer | Melanie | 2011-10-12 06:48:40 +0200 |
| commit | f4de1a6d9b54a85da08de3daadf094c562f88011 (patch) | |
| tree | 30c04386592af094ae01c5546d8e947b3bcf5525 | |
| parent | Merge branch 'bigmerge' of ssh://melanie@3dhosting.de/var/git/careminster int... (diff) | |
| download | opensim-SC_OLD-f4de1a6d9b54a85da08de3daadf094c562f88011.zip opensim-SC_OLD-f4de1a6d9b54a85da08de3daadf094c562f88011.tar.gz opensim-SC_OLD-f4de1a6d9b54a85da08de3daadf094c562f88011.tar.bz2 opensim-SC_OLD-f4de1a6d9b54a85da08de3daadf094c562f88011.tar.xz | |
HACK: Remove advanced property resending until it is fixed properly in core.
| -rw-r--r-- | OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs | 24 |
1 files changed, 14 insertions, 10 deletions
diff --git a/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs b/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs index 575e5a2..0c92308 100644 --- a/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs +++ b/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs | |||
| @@ -4220,11 +4220,13 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
| 4220 | 4220 | ||
| 4221 | // Pass in the delegate so that if this packet needs to be resent, we send the current properties | 4221 | // Pass in the delegate so that if this packet needs to be resent, we send the current properties |
| 4222 | // of the object rather than the properties when the packet was created | 4222 | // of the object rather than the properties when the packet was created |
| 4223 | OutPacket(packet, ThrottleOutPacketType.Task, true, | 4223 | // HACK : Remove intelligent resending until it's fixed in core |
| 4224 | delegate(OutgoingPacket oPacket) | 4224 | //OutPacket(packet, ThrottleOutPacketType.Task, true, |
| 4225 | { | 4225 | // delegate(OutgoingPacket oPacket) |
| 4226 | ResendPropertyUpdates(updates, oPacket); | 4226 | // { |
| 4227 | }); | 4227 | // ResendPropertyUpdates(updates, oPacket); |
| 4228 | // }); | ||
| 4229 | OutPacket(packet, ThrottleOutPacketType.Task, true); | ||
| 4228 | 4230 | ||
| 4229 | // pbcnt += blocks.Count; | 4231 | // pbcnt += blocks.Count; |
| 4230 | // ppcnt++; | 4232 | // ppcnt++; |
| @@ -4250,11 +4252,13 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
| 4250 | // of the object rather than the properties when the packet was created | 4252 | // of the object rather than the properties when the packet was created |
| 4251 | List<ObjectPropertyUpdate> updates = new List<ObjectPropertyUpdate>(); | 4253 | List<ObjectPropertyUpdate> updates = new List<ObjectPropertyUpdate>(); |
| 4252 | updates.Add(familyUpdates.Value[i]); | 4254 | updates.Add(familyUpdates.Value[i]); |
| 4253 | OutPacket(packet, ThrottleOutPacketType.Task, true, | 4255 | // HACK : Remove intelligent resending until it's fixed in core |
| 4254 | delegate(OutgoingPacket oPacket) | 4256 | //OutPacket(packet, ThrottleOutPacketType.Task, true, |
| 4255 | { | 4257 | // delegate(OutgoingPacket oPacket) |
| 4256 | ResendPropertyUpdates(updates, oPacket); | 4258 | // { |
| 4257 | }); | 4259 | // ResendPropertyUpdates(updates, oPacket); |
| 4260 | // }); | ||
| 4261 | OutPacket(packet, ThrottleOutPacketType.Task, true); | ||
| 4258 | 4262 | ||
| 4259 | // fpcnt++; | 4263 | // fpcnt++; |
| 4260 | // fbcnt++; | 4264 | // fbcnt++; |