diff options
author | Justin Clarke Casey | 2008-10-14 18:53:56 +0000 |
---|---|---|
committer | Justin Clarke Casey | 2008-10-14 18:53:56 +0000 |
commit | 58f8c042f616c2568496aeb13428230deb854db0 (patch) | |
tree | 4956e4bba8c96504141d0f16c4944212d6d5fb47 /OpenSim/Region/ClientStack | |
parent | * minor: Make it clear that non-scheduled updates can happen outside of the p... (diff) | |
download | opensim-SC_OLD-58f8c042f616c2568496aeb13428230deb854db0.zip opensim-SC_OLD-58f8c042f616c2568496aeb13428230deb854db0.tar.gz opensim-SC_OLD-58f8c042f616c2568496aeb13428230deb854db0.tar.bz2 opensim-SC_OLD-58f8c042f616c2568496aeb13428230deb854db0.tar.xz |
* minor: change m_debug to m_debugPacketLevel since that's what it is
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs | 24 |
1 files changed, 13 insertions, 11 deletions
diff --git a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs index e1c02e9..476b3d5 100644 --- a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs +++ b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs | |||
@@ -67,7 +67,9 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
67 | private readonly UUID m_sessionId; | 67 | private readonly UUID m_sessionId; |
68 | private UUID m_secureSessionId = UUID.Zero; | 68 | private UUID m_secureSessionId = UUID.Zero; |
69 | //private AgentAssetUpload UploadAssets; | 69 | //private AgentAssetUpload UploadAssets; |
70 | private int m_debug = 0; | 70 | |
71 | private int m_debugPacketLevel = 0; | ||
72 | |||
71 | private readonly AssetCache m_assetCache; | 73 | private readonly AssetCache m_assetCache; |
72 | // private InventoryCache m_inventoryCache; | 74 | // private InventoryCache m_inventoryCache; |
73 | private int m_cachedTextureSerial = 0; | 75 | private int m_cachedTextureSerial = 0; |
@@ -447,9 +449,9 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
447 | ThreadTracker.Add(m_clientThread); | 449 | ThreadTracker.Add(m_clientThread); |
448 | } | 450 | } |
449 | 451 | ||
450 | public void SetDebug(int newDebug) | 452 | public void SetDebugPacketLevel(int newDebugPacketLevel) |
451 | { | 453 | { |
452 | m_debug = newDebug; | 454 | m_debugPacketLevel = newDebugPacketLevel; |
453 | } | 455 | } |
454 | 456 | ||
455 | # region Client Methods | 457 | # region Client Methods |
@@ -632,23 +634,23 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
632 | 634 | ||
633 | protected void DebugPacket(string direction, Packet packet) | 635 | protected void DebugPacket(string direction, Packet packet) |
634 | { | 636 | { |
635 | if (m_debug > 0) | 637 | if (m_debugPacketLevel > 0) |
636 | { | 638 | { |
637 | string info = String.Empty; | 639 | string info = String.Empty; |
638 | 640 | ||
639 | if (m_debug < 255 && packet.Type == PacketType.AgentUpdate) | 641 | if (m_debugPacketLevel < 255 && packet.Type == PacketType.AgentUpdate) |
640 | return; | 642 | return; |
641 | if (m_debug < 254 && packet.Type == PacketType.ViewerEffect) | 643 | if (m_debugPacketLevel < 254 && packet.Type == PacketType.ViewerEffect) |
642 | return; | 644 | return; |
643 | if (m_debug < 253 && ( | 645 | if (m_debugPacketLevel < 253 && ( |
644 | packet.Type == PacketType.CompletePingCheck || | 646 | packet.Type == PacketType.CompletePingCheck || |
645 | packet.Type == PacketType.StartPingCheck | 647 | packet.Type == PacketType.StartPingCheck |
646 | )) | 648 | )) |
647 | return; | 649 | return; |
648 | if (m_debug < 252 && packet.Type == PacketType.PacketAck) | 650 | if (m_debugPacketLevel < 252 && packet.Type == PacketType.PacketAck) |
649 | return; | 651 | return; |
650 | 652 | ||
651 | if (m_debug > 1) | 653 | if (m_debugPacketLevel > 1) |
652 | { | 654 | { |
653 | info = packet.ToString(); | 655 | info = packet.ToString(); |
654 | } | 656 | } |
@@ -2348,7 +2350,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
2348 | Vector3 velocity, Quaternion rotation) | 2350 | Vector3 velocity, Quaternion rotation) |
2349 | { | 2351 | { |
2350 | if (rotation.X == rotation.Y && rotation.Y == rotation.Z && rotation.Z == rotation.W && rotation.W == 0) | 2352 | if (rotation.X == rotation.Y && rotation.Y == rotation.Z && rotation.Z == rotation.W && rotation.W == 0) |
2351 | rotation = Quaternion.Identity; | 2353 | rotation = Quaternion.Identity; |
2352 | 2354 | ||
2353 | ImprovedTerseObjectUpdatePacket.ObjectDataBlock terseBlock = | 2355 | ImprovedTerseObjectUpdatePacket.ObjectDataBlock terseBlock = |
2354 | CreateAvatarImprovedBlock(localID, position, velocity, rotation); | 2356 | CreateAvatarImprovedBlock(localID, position, velocity, rotation); |
@@ -2360,8 +2362,8 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
2360 | terse.ObjectData[0] = terseBlock; | 2362 | terse.ObjectData[0] = terseBlock; |
2361 | 2363 | ||
2362 | terse.Header.Reliable = false; | 2364 | terse.Header.Reliable = false; |
2363 | |||
2364 | terse.Header.Zerocoded = true; | 2365 | terse.Header.Zerocoded = true; |
2366 | |||
2365 | OutPacket(terse, ThrottleOutPacketType.Task); | 2367 | OutPacket(terse, ThrottleOutPacketType.Task); |
2366 | } | 2368 | } |
2367 | 2369 | ||