diff options
author | Diva Canto | 2013-07-21 10:07:35 -0700 |
---|---|---|
committer | Diva Canto | 2013-07-21 10:07:35 -0700 |
commit | 99a727600b938383224285d9dad79e2b564cb1fe (patch) | |
tree | 86fb53a7d00a0d7f3bcb2556c9de187a8544921e /OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs | |
parent | Minor aesthetic change to make things more clear. (diff) | |
download | opensim-SC_OLD-99a727600b938383224285d9dad79e2b564cb1fe.zip opensim-SC_OLD-99a727600b938383224285d9dad79e2b564cb1fe.tar.gz opensim-SC_OLD-99a727600b938383224285d9dad79e2b564cb1fe.tar.bz2 opensim-SC_OLD-99a727600b938383224285d9dad79e2b564cb1fe.tar.xz |
Minor cosmetic changes.
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs | 50 |
1 files changed, 23 insertions, 27 deletions
diff --git a/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs b/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs index 021b7c1..e23e55b 100644 --- a/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs +++ b/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs | |||
@@ -5595,7 +5595,23 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
5595 | vdelta3 = Vector3.Distance(x.CameraLeftAxis, m_thisAgentUpdateArgs.CameraLeftAxis); | 5595 | vdelta3 = Vector3.Distance(x.CameraLeftAxis, m_thisAgentUpdateArgs.CameraLeftAxis); |
5596 | vdelta4 = Vector3.Distance(x.CameraUpAxis, m_thisAgentUpdateArgs.CameraUpAxis); | 5596 | vdelta4 = Vector3.Distance(x.CameraUpAxis, m_thisAgentUpdateArgs.CameraUpAxis); |
5597 | 5597 | ||
5598 | return CheckAgentMovementUpdateSignificance(x) || CheckAgentCameraUpdateSignificance(x); | 5598 | bool significant = CheckAgentMovementUpdateSignificance(x) || CheckAgentCameraUpdateSignificance(x); |
5599 | |||
5600 | // Emergency debugging | ||
5601 | //if (significant) | ||
5602 | //{ | ||
5603 | //m_log.DebugFormat("[LLCLIENTVIEW]: Cam1 {0} {1}", | ||
5604 | // x.CameraAtAxis, x.CameraCenter); | ||
5605 | //m_log.DebugFormat("[LLCLIENTVIEW]: Cam2 {0} {1}", | ||
5606 | // x.CameraLeftAxis, x.CameraUpAxis); | ||
5607 | //m_log.DebugFormat("[LLCLIENTVIEW]: Bod {0} {1}", | ||
5608 | // qdelta1, qdelta2); | ||
5609 | //m_log.DebugFormat("[LLCLIENTVIEW]: St {0} {1} {2} {3}", | ||
5610 | // x.ControlFlags, x.Flags, x.Far, x.State); | ||
5611 | //} | ||
5612 | |||
5613 | return significant; | ||
5614 | |||
5599 | } | 5615 | } |
5600 | 5616 | ||
5601 | /// <summary> | 5617 | /// <summary> |
@@ -5606,24 +5622,15 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
5606 | /// <param name='x'></param> | 5622 | /// <param name='x'></param> |
5607 | private bool CheckAgentMovementUpdateSignificance(AgentUpdatePacket.AgentDataBlock x) | 5623 | private bool CheckAgentMovementUpdateSignificance(AgentUpdatePacket.AgentDataBlock x) |
5608 | { | 5624 | { |
5609 | if ( | 5625 | return ( |
5610 | (qdelta1 > QDELTA) || | 5626 | (qdelta1 > QDELTA) || |
5611 | // Ignoring head rotation altogether, because it's not being used for anything interesting up the stack | 5627 | // Ignoring head rotation altogether, because it's not being used for anything interesting up the stack |
5612 | //(qdelta2 > QDELTA * 10) || | 5628 | //(qdelta2 > QDELTA * 10) || |
5613 | (x.ControlFlags != m_thisAgentUpdateArgs.ControlFlags) || | 5629 | (x.ControlFlags != m_thisAgentUpdateArgs.ControlFlags) || |
5614 | (x.Far != m_thisAgentUpdateArgs.Far) || | 5630 | (x.Far != m_thisAgentUpdateArgs.Far) || |
5615 | (x.Flags != m_thisAgentUpdateArgs.Flags) || | 5631 | (x.Flags != m_thisAgentUpdateArgs.Flags) || |
5616 | (x.State != m_thisAgentUpdateArgs.State) | 5632 | (x.State != m_thisAgentUpdateArgs.State) |
5617 | ) | 5633 | ); |
5618 | { | ||
5619 | //m_log.DebugFormat("[LLCLIENTVIEW]: Bod {0} {1}", | ||
5620 | // qdelta1, qdelta2); | ||
5621 | //m_log.DebugFormat("[LLCLIENTVIEW]: St {0} {1} {2} {3} (Thread {4})", | ||
5622 | // x.ControlFlags, x.Flags, x.Far, x.State, Thread.CurrentThread.Name); | ||
5623 | return true; | ||
5624 | } | ||
5625 | |||
5626 | return false; | ||
5627 | } | 5634 | } |
5628 | 5635 | ||
5629 | /// <summary> | 5636 | /// <summary> |
@@ -5634,23 +5641,12 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
5634 | /// <param name='x'></param> | 5641 | /// <param name='x'></param> |
5635 | private bool CheckAgentCameraUpdateSignificance(AgentUpdatePacket.AgentDataBlock x) | 5642 | private bool CheckAgentCameraUpdateSignificance(AgentUpdatePacket.AgentDataBlock x) |
5636 | { | 5643 | { |
5637 | if ( | 5644 | return ( |
5638 | /* These 4 are the worst offenders! | ||
5639 | * With Singularity, there is a bug where sometimes the spam on these doesn't stop */ | ||
5640 | (vdelta1 > VDELTA) || | 5645 | (vdelta1 > VDELTA) || |
5641 | (vdelta2 > VDELTA) || | 5646 | (vdelta2 > VDELTA) || |
5642 | (vdelta3 > VDELTA) || | 5647 | (vdelta3 > VDELTA) || |
5643 | (vdelta4 > VDELTA) | 5648 | (vdelta4 > VDELTA) |
5644 | ) | 5649 | ); |
5645 | { | ||
5646 | //m_log.DebugFormat("[LLCLIENTVIEW]: Cam1 {0} {1}", | ||
5647 | // x.CameraAtAxis, x.CameraCenter); | ||
5648 | //m_log.DebugFormat("[LLCLIENTVIEW]: Cam2 {0} {1}", | ||
5649 | // x.CameraLeftAxis, x.CameraUpAxis); | ||
5650 | return true; | ||
5651 | } | ||
5652 | |||
5653 | return false; | ||
5654 | } | 5650 | } |
5655 | 5651 | ||
5656 | private bool HandleAgentUpdate(IClientAPI sener, Packet packet) | 5652 | private bool HandleAgentUpdate(IClientAPI sener, Packet packet) |