aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
diff options
context:
space:
mode:
authorRobert Adams2013-11-04 22:12:57 -0800
committerRobert Adams2013-11-04 22:12:57 -0800
commitc931b16c1fd50d3b955662c8cd6134d7a235c519 (patch)
tree8aeca3e6dccf6b177908f3842196f59230777109 /OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
parentvarregion: add plumbing to pass region size from Scene down to the (diff)
parentIf the LSL state_entry() event definition contains any parameters, then gener... (diff)
downloadopensim-SC_OLD-c931b16c1fd50d3b955662c8cd6134d7a235c519.zip
opensim-SC_OLD-c931b16c1fd50d3b955662c8cd6134d7a235c519.tar.gz
opensim-SC_OLD-c931b16c1fd50d3b955662c8cd6134d7a235c519.tar.bz2
opensim-SC_OLD-c931b16c1fd50d3b955662c8cd6134d7a235c519.tar.xz
Merge branch 'master' into varregion
Diffstat (limited to 'OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs')
-rw-r--r--OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs10
1 files changed, 9 insertions, 1 deletions
diff --git a/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs b/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
index d2fa837..00fa5db 100644
--- a/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
+++ b/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
@@ -3773,7 +3773,11 @@ namespace OpenSim.Region.ClientStack.LindenUDP
3773 m_udpClient.NeedAcks.Remove(oPacket.SequenceNumber); 3773 m_udpClient.NeedAcks.Remove(oPacket.SequenceNumber);
3774 3774
3775 // Count this as a resent packet since we are going to requeue all of the updates contained in it 3775 // Count this as a resent packet since we are going to requeue all of the updates contained in it
3776 Interlocked.Increment(ref m_udpClient.PacketsResent); 3776 Interlocked.Increment(ref m_udpClient.PacketsResent);
3777
3778 // We're not going to worry about interlock yet since its not currently critical that this total count
3779 // is 100% correct
3780 m_udpServer.PacketsResentCount++;
3777 3781
3778 foreach (EntityUpdate update in updates) 3782 foreach (EntityUpdate update in updates)
3779 ResendPrimUpdate(update); 3783 ResendPrimUpdate(update);
@@ -4335,6 +4339,10 @@ namespace OpenSim.Region.ClientStack.LindenUDP
4335 // Count this as a resent packet since we are going to requeue all of the updates contained in it 4339 // Count this as a resent packet since we are going to requeue all of the updates contained in it
4336 Interlocked.Increment(ref m_udpClient.PacketsResent); 4340 Interlocked.Increment(ref m_udpClient.PacketsResent);
4337 4341
4342 // We're not going to worry about interlock yet since its not currently critical that this total count
4343 // is 100% correct
4344 m_udpServer.PacketsResentCount++;
4345
4338 foreach (ObjectPropertyUpdate update in updates) 4346 foreach (ObjectPropertyUpdate update in updates)
4339 ResendPropertyUpdate(update); 4347 ResendPropertyUpdate(update);
4340 } 4348 }