diff options
author | John Hurliman | 2009-10-16 17:33:41 -0700 |
---|---|---|
committer | John Hurliman | 2009-10-16 17:33:41 -0700 |
commit | c81378dc22499ccb03f827e4821214ce7eb87dc1 (patch) | |
tree | 41ad953a57ceb1009b8010c517704efcf25f3ac6 | |
parent | More debugging of RegionCombinerModule.RegionLoaded() by making RegionLoaded(... (diff) | |
download | opensim-SC-c81378dc22499ccb03f827e4821214ce7eb87dc1.zip opensim-SC-c81378dc22499ccb03f827e4821214ce7eb87dc1.tar.gz opensim-SC-c81378dc22499ccb03f827e4821214ce7eb87dc1.tar.bz2 opensim-SC-c81378dc22499ccb03f827e4821214ce7eb87dc1.tar.xz |
Changing avatar movement updates to the Task throttle category until we get finer grained prioritization of avatars vs. prims
-rw-r--r-- | OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs index 383eac0..43c3c7c 100644 --- a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs +++ b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs | |||
@@ -3426,7 +3426,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
3426 | terse.Header.Reliable = false; | 3426 | terse.Header.Reliable = false; |
3427 | terse.Header.Zerocoded = true; | 3427 | terse.Header.Zerocoded = true; |
3428 | 3428 | ||
3429 | OutPacket(terse, ThrottleOutPacketType.State); | 3429 | OutPacket(terse, ThrottleOutPacketType.Task); |
3430 | } | 3430 | } |
3431 | } | 3431 | } |
3432 | 3432 | ||
@@ -3582,14 +3582,14 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
3582 | 3582 | ||
3583 | void HandleQueueEmpty(ThrottleOutPacketType queue) | 3583 | void HandleQueueEmpty(ThrottleOutPacketType queue) |
3584 | { | 3584 | { |
3585 | int count = 0; | ||
3586 | |||
3585 | switch (queue) | 3587 | switch (queue) |
3586 | { | 3588 | { |
3587 | case ThrottleOutPacketType.Texture: | 3589 | case ThrottleOutPacketType.Texture: |
3588 | ProcessTextureRequests(); | 3590 | ProcessTextureRequests(); |
3589 | break; | 3591 | break; |
3590 | case ThrottleOutPacketType.State: | 3592 | case ThrottleOutPacketType.Task: |
3591 | int count = 0; | ||
3592 | |||
3593 | lock (m_avatarTerseUpdates.SyncRoot) | 3593 | lock (m_avatarTerseUpdates.SyncRoot) |
3594 | count = m_avatarTerseUpdates.Count; | 3594 | count = m_avatarTerseUpdates.Count; |
3595 | if (count > 0) | 3595 | if (count > 0) |
@@ -3597,7 +3597,8 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
3597 | ProcessAvatarTerseUpdates(); | 3597 | ProcessAvatarTerseUpdates(); |
3598 | return; | 3598 | return; |
3599 | } | 3599 | } |
3600 | 3600 | break; | |
3601 | case ThrottleOutPacketType.State: | ||
3601 | lock (m_primFullUpdates.SyncRoot) | 3602 | lock (m_primFullUpdates.SyncRoot) |
3602 | count = m_primFullUpdates.Count; | 3603 | count = m_primFullUpdates.Count; |
3603 | if (count > 0) | 3604 | if (count > 0) |