diff options
author | Sean Dague | 2007-11-27 20:37:17 +0000 |
---|---|---|
committer | Sean Dague | 2007-11-27 20:37:17 +0000 |
commit | cebdd069f49a5ba6e5bc84eb5e96a63320795226 (patch) | |
tree | 1f4cd4022c9cf94ed87081fdabcd62021ccb248d /OpenSim/Region/ClientStack/ClientView.PacketQueue.cs | |
parent | Fixed bug, where the clients in a region weren't told to kill a user's avatar... (diff) | |
download | opensim-SC_OLD-cebdd069f49a5ba6e5bc84eb5e96a63320795226.zip opensim-SC_OLD-cebdd069f49a5ba6e5bc84eb5e96a63320795226.tar.gz opensim-SC_OLD-cebdd069f49a5ba6e5bc84eb5e96a63320795226.tar.bz2 opensim-SC_OLD-cebdd069f49a5ba6e5bc84eb5e96a63320795226.tar.xz |
some variable renames to help me read the throttle code
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/ClientStack/ClientView.PacketQueue.cs | 42 |
1 files changed, 21 insertions, 21 deletions
diff --git a/OpenSim/Region/ClientStack/ClientView.PacketQueue.cs b/OpenSim/Region/ClientStack/ClientView.PacketQueue.cs index 4ca7bd9..5916d00 100644 --- a/OpenSim/Region/ClientStack/ClientView.PacketQueue.cs +++ b/OpenSim/Region/ClientStack/ClientView.PacketQueue.cs | |||
@@ -232,10 +232,10 @@ namespace OpenSim.Region.ClientStack | |||
232 | switch (throttlePacketType) | 232 | switch (throttlePacketType) |
233 | { | 233 | { |
234 | case ThrottleOutPacketType.Resend: | 234 | case ThrottleOutPacketType.Resend: |
235 | if (ResendthrottleSentPeriod <= ((int)(ResendthrottleOutbound / throttleTimeDivisor)) && ResendOutgoingPacketQueue.Count == 0) | 235 | if (ResendBytesSent <= ((int)(ResendthrottleOutbound / throttleTimeDivisor)) && ResendOutgoingPacketQueue.Count == 0) |
236 | { | 236 | { |
237 | throttleSentPeriod += item.Packet.ToBytes().Length; | 237 | bytesSent += item.Packet.ToBytes().Length; |
238 | ResendthrottleSentPeriod += item.Packet.ToBytes().Length; | 238 | ResendBytesSent += item.Packet.ToBytes().Length; |
239 | PacketQueue.Enqueue(item); | 239 | PacketQueue.Enqueue(item); |
240 | } | 240 | } |
241 | else | 241 | else |
@@ -244,10 +244,10 @@ namespace OpenSim.Region.ClientStack | |||
244 | } | 244 | } |
245 | break; | 245 | break; |
246 | case ThrottleOutPacketType.Texture: | 246 | case ThrottleOutPacketType.Texture: |
247 | if (TexturethrottleSentPeriod <= ((int)(TexturethrottleOutbound / throttleTimeDivisor)) && TextureOutgoingPacketQueue.Count == 0) | 247 | if (TextureBytesSent <= ((int)(TexturethrottleOutbound / throttleTimeDivisor)) && TextureOutgoingPacketQueue.Count == 0) |
248 | { | 248 | { |
249 | throttleSentPeriod += item.Packet.ToBytes().Length; | 249 | bytesSent += item.Packet.ToBytes().Length; |
250 | TexturethrottleSentPeriod += item.Packet.ToBytes().Length; | 250 | TextureBytesSent += item.Packet.ToBytes().Length; |
251 | PacketQueue.Enqueue(item); | 251 | PacketQueue.Enqueue(item); |
252 | } | 252 | } |
253 | else | 253 | else |
@@ -256,10 +256,10 @@ namespace OpenSim.Region.ClientStack | |||
256 | } | 256 | } |
257 | break; | 257 | break; |
258 | case ThrottleOutPacketType.Task: | 258 | case ThrottleOutPacketType.Task: |
259 | if (TaskthrottleSentPeriod <= ((int)(TexturethrottleOutbound / throttleTimeDivisor)) && TaskOutgoingPacketQueue.Count == 0) | 259 | if (TaskBytesSent <= ((int)(TexturethrottleOutbound / throttleTimeDivisor)) && TaskOutgoingPacketQueue.Count == 0) |
260 | { | 260 | { |
261 | throttleSentPeriod += item.Packet.ToBytes().Length; | 261 | bytesSent += item.Packet.ToBytes().Length; |
262 | TaskthrottleSentPeriod += item.Packet.ToBytes().Length; | 262 | TaskBytesSent += item.Packet.ToBytes().Length; |
263 | PacketQueue.Enqueue(item); | 263 | PacketQueue.Enqueue(item); |
264 | } | 264 | } |
265 | else | 265 | else |
@@ -268,10 +268,10 @@ namespace OpenSim.Region.ClientStack | |||
268 | } | 268 | } |
269 | break; | 269 | break; |
270 | case ThrottleOutPacketType.Land: | 270 | case ThrottleOutPacketType.Land: |
271 | if (LandthrottleSentPeriod <= ((int)(LandthrottleOutbound / throttleTimeDivisor)) && LandOutgoingPacketQueue.Count == 0) | 271 | if (LandBytesSent <= ((int)(LandthrottleOutbound / throttleTimeDivisor)) && LandOutgoingPacketQueue.Count == 0) |
272 | { | 272 | { |
273 | throttleSentPeriod += item.Packet.ToBytes().Length; | 273 | bytesSent += item.Packet.ToBytes().Length; |
274 | LandthrottleSentPeriod += item.Packet.ToBytes().Length; | 274 | LandBytesSent += item.Packet.ToBytes().Length; |
275 | PacketQueue.Enqueue(item); | 275 | PacketQueue.Enqueue(item); |
276 | } | 276 | } |
277 | else | 277 | else |
@@ -280,10 +280,10 @@ namespace OpenSim.Region.ClientStack | |||
280 | } | 280 | } |
281 | break; | 281 | break; |
282 | case ThrottleOutPacketType.Asset: | 282 | case ThrottleOutPacketType.Asset: |
283 | if (AssetthrottleSentPeriod <= ((int)(AssetthrottleOutbound / throttleTimeDivisor)) && AssetOutgoingPacketQueue.Count == 0) | 283 | if (AssetBytesSent <= ((int)(AssetthrottleOutbound / throttleTimeDivisor)) && AssetOutgoingPacketQueue.Count == 0) |
284 | { | 284 | { |
285 | throttleSentPeriod += item.Packet.ToBytes().Length; | 285 | bytesSent += item.Packet.ToBytes().Length; |
286 | AssetthrottleSentPeriod += item.Packet.ToBytes().Length; | 286 | AssetBytesSent += item.Packet.ToBytes().Length; |
287 | PacketQueue.Enqueue(item); | 287 | PacketQueue.Enqueue(item); |
288 | } | 288 | } |
289 | else | 289 | else |
@@ -292,10 +292,10 @@ namespace OpenSim.Region.ClientStack | |||
292 | } | 292 | } |
293 | break; | 293 | break; |
294 | case ThrottleOutPacketType.Cloud: | 294 | case ThrottleOutPacketType.Cloud: |
295 | if (CloudthrottleSentPeriod <= ((int)(CloudthrottleOutbound / throttleTimeDivisor)) && CloudOutgoingPacketQueue.Count == 0) | 295 | if (CloudBytesSent <= ((int)(CloudthrottleOutbound / throttleTimeDivisor)) && CloudOutgoingPacketQueue.Count == 0) |
296 | { | 296 | { |
297 | throttleSentPeriod += item.Packet.ToBytes().Length; | 297 | bytesSent += item.Packet.ToBytes().Length; |
298 | CloudthrottleSentPeriod += item.Packet.ToBytes().Length; | 298 | CloudBytesSent += item.Packet.ToBytes().Length; |
299 | PacketQueue.Enqueue(item); | 299 | PacketQueue.Enqueue(item); |
300 | } | 300 | } |
301 | else | 301 | else |
@@ -304,10 +304,10 @@ namespace OpenSim.Region.ClientStack | |||
304 | } | 304 | } |
305 | break; | 305 | break; |
306 | case ThrottleOutPacketType.Wind: | 306 | case ThrottleOutPacketType.Wind: |
307 | if (WindthrottleSentPeriod <= ((int)(WindthrottleOutbound / throttleTimeDivisor)) && WindOutgoingPacketQueue.Count == 0) | 307 | if (WindBytesSent <= ((int)(WindthrottleOutbound / throttleTimeDivisor)) && WindOutgoingPacketQueue.Count == 0) |
308 | { | 308 | { |
309 | throttleSentPeriod += item.Packet.ToBytes().Length; | 309 | bytesSent += item.Packet.ToBytes().Length; |
310 | WindthrottleSentPeriod += item.Packet.ToBytes().Length; | 310 | WindBytesSent += item.Packet.ToBytes().Length; |
311 | PacketQueue.Enqueue(item); | 311 | PacketQueue.Enqueue(item); |
312 | } | 312 | } |
313 | else | 313 | else |