From 99a727600b938383224285d9dad79e2b564cb1fe Mon Sep 17 00:00:00 2001
From: Diva Canto
Date: Sun, 21 Jul 2013 10:07:35 -0700
Subject: Minor cosmetic changes.
---
.../Region/ClientStack/Linden/UDP/LLClientView.cs | 50 ++++++++++------------
1 file changed, 23 insertions(+), 27 deletions(-)
(limited to 'OpenSim')
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
vdelta3 = Vector3.Distance(x.CameraLeftAxis, m_thisAgentUpdateArgs.CameraLeftAxis);
vdelta4 = Vector3.Distance(x.CameraUpAxis, m_thisAgentUpdateArgs.CameraUpAxis);
- return CheckAgentMovementUpdateSignificance(x) || CheckAgentCameraUpdateSignificance(x);
+ bool significant = CheckAgentMovementUpdateSignificance(x) || CheckAgentCameraUpdateSignificance(x);
+
+ // Emergency debugging
+ //if (significant)
+ //{
+ //m_log.DebugFormat("[LLCLIENTVIEW]: Cam1 {0} {1}",
+ // x.CameraAtAxis, x.CameraCenter);
+ //m_log.DebugFormat("[LLCLIENTVIEW]: Cam2 {0} {1}",
+ // x.CameraLeftAxis, x.CameraUpAxis);
+ //m_log.DebugFormat("[LLCLIENTVIEW]: Bod {0} {1}",
+ // qdelta1, qdelta2);
+ //m_log.DebugFormat("[LLCLIENTVIEW]: St {0} {1} {2} {3}",
+ // x.ControlFlags, x.Flags, x.Far, x.State);
+ //}
+
+ return significant;
+
}
/// <summary>
@@ -5606,24 +5622,15 @@ namespace OpenSim.Region.ClientStack.LindenUDP
/// <param name='x'></param>
private bool CheckAgentMovementUpdateSignificance(AgentUpdatePacket.AgentDataBlock x)
{
- if (
+ return (
(qdelta1 > QDELTA) ||
// Ignoring head rotation altogether, because it's not being used for anything interesting up the stack
//(qdelta2 > QDELTA * 10) ||
(x.ControlFlags != m_thisAgentUpdateArgs.ControlFlags) ||
(x.Far != m_thisAgentUpdateArgs.Far) ||
(x.Flags != m_thisAgentUpdateArgs.Flags) ||
- (x.State != m_thisAgentUpdateArgs.State)
- )
- {
- //m_log.DebugFormat("[LLCLIENTVIEW]: Bod {0} {1}",
- // qdelta1, qdelta2);
- //m_log.DebugFormat("[LLCLIENTVIEW]: St {0} {1} {2} {3} (Thread {4})",
- // x.ControlFlags, x.Flags, x.Far, x.State, Thread.CurrentThread.Name);
- return true;
- }
-
- return false;
+ (x.State != m_thisAgentUpdateArgs.State)
+ );
}
/// <summary>
@@ -5634,23 +5641,12 @@ namespace OpenSim.Region.ClientStack.LindenUDP
/// <param name='x'></param>
private bool CheckAgentCameraUpdateSignificance(AgentUpdatePacket.AgentDataBlock x)
{
- if (
- /* These 4 are the worst offenders!
- * With Singularity, there is a bug where sometimes the spam on these doesn't stop */
+ return (
(vdelta1 > VDELTA) ||
(vdelta2 > VDELTA) ||
(vdelta3 > VDELTA) ||
- (vdelta4 > VDELTA)
- )
- {
- //m_log.DebugFormat("[LLCLIENTVIEW]: Cam1 {0} {1}",
- // x.CameraAtAxis, x.CameraCenter);
- //m_log.DebugFormat("[LLCLIENTVIEW]: Cam2 {0} {1}",
- // x.CameraLeftAxis, x.CameraUpAxis);
- return true;
- }
-
- return false;
+ (vdelta4 > VDELTA)
+ );
}
private bool HandleAgentUpdate(IClientAPI sener, Packet packet)
--
cgit v1.1