aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/ClientStack/LindenUDP
diff options
context:
space:
mode:
authorMelanie Thielker2008-08-18 18:59:06 +0000
committerMelanie Thielker2008-08-18 18:59:06 +0000
commit6614eee4d436644b2709d216a516b3ee6142635f (patch)
tree908c8a7392b56bee3a86c562042e2d783f16105b /OpenSim/Region/ClientStack/LindenUDP
parentAvatar Attachment persistence!! Patch #9168 (Mantis #1171) (diff)
downloadopensim-SC_OLD-6614eee4d436644b2709d216a516b3ee6142635f.zip
opensim-SC_OLD-6614eee4d436644b2709d216a516b3ee6142635f.tar.gz
opensim-SC_OLD-6614eee4d436644b2709d216a516b3ee6142635f.tar.bz2
opensim-SC_OLD-6614eee4d436644b2709d216a516b3ee6142635f.tar.xz
Change LowpriorityTask to be ThrottleType.Task | ThrottleType.LowPriority to make the flag nature of this value more clear.
Diffstat (limited to 'OpenSim/Region/ClientStack/LindenUDP')
-rw-r--r--OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs6
-rw-r--r--OpenSim/Region/ClientStack/LindenUDP/LLPacketQueue.cs10
2 files changed, 8 insertions, 8 deletions
diff --git a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
index 3c24fb6..8f0e2d7 100644
--- a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
+++ b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
@@ -2364,7 +2364,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
2364 } 2364 }
2365 outPacket.Header.Zerocoded = true; 2365 outPacket.Header.Zerocoded = true;
2366 2366
2367 OutPacket(outPacket, ThrottleOutPacketType.LowpriorityTask); 2367 OutPacket(outPacket, ThrottleOutPacketType.Task | ThrottleOutPacketType.LowPriority);
2368 } 2368 }
2369 2369
2370 /// <summary> 2370 /// <summary>
@@ -2388,7 +2388,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
2388 terse.ObjectData[0] = CreatePrimImprovedBlock(localID, position, rotation, velocity, rotationalvelocity, state); // AssetID should fall into here probably somehow... 2388 terse.ObjectData[0] = CreatePrimImprovedBlock(localID, position, rotation, velocity, rotationalvelocity, state); // AssetID should fall into here probably somehow...
2389 terse.Header.Reliable = false; 2389 terse.Header.Reliable = false;
2390 terse.Header.Zerocoded = true; 2390 terse.Header.Zerocoded = true;
2391 OutPacket(terse, ThrottleOutPacketType.LowpriorityTask); 2391 OutPacket(terse, ThrottleOutPacketType.Task | ThrottleOutPacketType.LowPriority);
2392 } 2392 }
2393 2393
2394 public void SendPrimTerseUpdate(ulong regionHandle, ushort timeDilation, uint localID, LLVector3 position, 2394 public void SendPrimTerseUpdate(ulong regionHandle, ushort timeDilation, uint localID, LLVector3 position,
@@ -2404,7 +2404,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
2404 terse.ObjectData[0] = CreatePrimImprovedBlock(localID, position, rotation, velocity, rotationalvelocity, 0); 2404 terse.ObjectData[0] = CreatePrimImprovedBlock(localID, position, rotation, velocity, rotationalvelocity, 0);
2405 terse.Header.Reliable = false; 2405 terse.Header.Reliable = false;
2406 terse.Header.Zerocoded = true; 2406 terse.Header.Zerocoded = true;
2407 OutPacket(terse, ThrottleOutPacketType.LowpriorityTask); 2407 OutPacket(terse, ThrottleOutPacketType.Task | ThrottleOutPacketType.LowPriority);
2408 } 2408 }
2409 2409
2410 public void SendAssetUploadCompleteMessage(sbyte AssetType, bool Success, LLUUID AssetFullID) 2410 public void SendAssetUploadCompleteMessage(sbyte AssetType, bool Success, LLUUID AssetFullID)
diff --git a/OpenSim/Region/ClientStack/LindenUDP/LLPacketQueue.cs b/OpenSim/Region/ClientStack/LindenUDP/LLPacketQueue.cs
index aed9465..2775241 100644
--- a/OpenSim/Region/ClientStack/LindenUDP/LLPacketQueue.cs
+++ b/OpenSim/Region/ClientStack/LindenUDP/LLPacketQueue.cs
@@ -159,7 +159,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
159 159
160 lock (this) 160 lock (this)
161 { 161 {
162 switch (item.throttleType) 162 switch (item.throttleType & ThrottleOutPacketType.TypeMask)
163 { 163 {
164 case ThrottleOutPacketType.Resend: 164 case ThrottleOutPacketType.Resend:
165 ThrottleCheck(ref ResendThrottle, ref ResendOutgoingPacketQueue, item); 165 ThrottleCheck(ref ResendThrottle, ref ResendOutgoingPacketQueue, item);
@@ -168,10 +168,10 @@ namespace OpenSim.Region.ClientStack.LindenUDP
168 ThrottleCheck(ref TextureThrottle, ref TextureOutgoingPacketQueue, item); 168 ThrottleCheck(ref TextureThrottle, ref TextureOutgoingPacketQueue, item);
169 break; 169 break;
170 case ThrottleOutPacketType.Task: 170 case ThrottleOutPacketType.Task:
171 ThrottleCheck(ref TaskThrottle, ref TaskOutgoingPacketQueue, item); 171 if((item.throttleType & ThrottleOutPacketType.LowPriority) != 0)
172 break; 172 ThrottleCheck(ref TaskThrottle, ref TaskLowpriorityPacketQueue, item);
173 case ThrottleOutPacketType.LowpriorityTask: 173 else
174 ThrottleCheck(ref TaskThrottle, ref TaskLowpriorityPacketQueue, item); 174 ThrottleCheck(ref TaskThrottle, ref TaskOutgoingPacketQueue, item);
175 break; 175 break;
176 case ThrottleOutPacketType.Land: 176 case ThrottleOutPacketType.Land:
177 ThrottleCheck(ref LandThrottle, ref LandOutgoingPacketQueue, item); 177 ThrottleCheck(ref LandThrottle, ref LandOutgoingPacketQueue, item);