aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
-rw-r--r--OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs18
-rw-r--r--OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs2
-rw-r--r--OpenSim/Region/OptionalModules/Agent/UDP/Linden/LindenUDPInfoModule.cs8
3 files changed, 19 insertions, 9 deletions
diff --git a/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs b/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
index 3d085c3..66a8ea7 100644
--- a/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
+++ b/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
@@ -5567,7 +5567,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
5567 5567
5568 #region Packet Handlers 5568 #region Packet Handlers
5569 5569
5570 public int TotalSignificantAgentUpdates { get; private set; } 5570 public int TotalAgentUpdates { get; set; }
5571 5571
5572 #region Scene/Avatar 5572 #region Scene/Avatar
5573 5573
@@ -5583,11 +5583,14 @@ namespace OpenSim.Region.ClientStack.LindenUDP
5583 // least likely to change. I've made an initial 5583 // least likely to change. I've made an initial
5584 // guess at that. 5584 // guess at that.
5585 if ( 5585 if (
5586 (x.BodyRotation != m_lastAgentUpdateArgs.BodyRotation) || 5586 /* These 4 are the worst offenders! We should consider ignoring most of them.
5587 * With Singularity, there is a bug where sometimes the spam on these doesn't stop */
5587 (x.CameraAtAxis != m_lastAgentUpdateArgs.CameraAtAxis) || 5588 (x.CameraAtAxis != m_lastAgentUpdateArgs.CameraAtAxis) ||
5588 (x.CameraCenter != m_lastAgentUpdateArgs.CameraCenter) || 5589 (x.CameraCenter != m_lastAgentUpdateArgs.CameraCenter) ||
5589 (x.CameraLeftAxis != m_lastAgentUpdateArgs.CameraLeftAxis) || 5590 (x.CameraLeftAxis != m_lastAgentUpdateArgs.CameraLeftAxis) ||
5590 (x.CameraUpAxis != m_lastAgentUpdateArgs.CameraUpAxis) || 5591 (x.CameraUpAxis != m_lastAgentUpdateArgs.CameraUpAxis) ||
5592 /* */
5593 (x.BodyRotation != m_lastAgentUpdateArgs.BodyRotation) ||
5591 (x.ControlFlags != m_lastAgentUpdateArgs.ControlFlags) || 5594 (x.ControlFlags != m_lastAgentUpdateArgs.ControlFlags) ||
5592 (x.Far != m_lastAgentUpdateArgs.Far) || 5595 (x.Far != m_lastAgentUpdateArgs.Far) ||
5593 (x.Flags != m_lastAgentUpdateArgs.Flags) || 5596 (x.Flags != m_lastAgentUpdateArgs.Flags) ||
@@ -5597,8 +5600,14 @@ namespace OpenSim.Region.ClientStack.LindenUDP
5597 (x.AgentID != m_lastAgentUpdateArgs.AgentID) 5600 (x.AgentID != m_lastAgentUpdateArgs.AgentID)
5598 ) 5601 )
5599 { 5602 {
5600// m_log.DebugFormat("[LLCLIENTVIEW]: Triggered AgentUpdate for {0}", sener.Name); 5603 //m_log.DebugFormat("[LLCLIENTVIEW]: Cam1 {0} {1}",
5601 TotalSignificantAgentUpdates++; 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 // x.BodyRotation, x.HeadRotation);
5609 //m_log.DebugFormat("[LLCLIENTVIEW]: St {0} {1} {2} {3}",
5610 // x.ControlFlags, x.Flags, x.Far, x.State);
5602 5611
5603 m_lastAgentUpdateArgs.AgentID = x.AgentID; 5612 m_lastAgentUpdateArgs.AgentID = x.AgentID;
5604 m_lastAgentUpdateArgs.BodyRotation = x.BodyRotation; 5613 m_lastAgentUpdateArgs.BodyRotation = x.BodyRotation;
@@ -5662,7 +5671,6 @@ namespace OpenSim.Region.ClientStack.LindenUDP
5662// if (update) 5671// if (update)
5663// { 5672// {
5664//// m_log.DebugFormat("[LLCLIENTVIEW]: Triggered AgentUpdate for {0}", sener.Name); 5673//// m_log.DebugFormat("[LLCLIENTVIEW]: Triggered AgentUpdate for {0}", sener.Name);
5665 TotalSignificantAgentUpdates++;
5666 5674
5667 m_thisAgentUpdateArgs.AgentID = x.AgentID; 5675 m_thisAgentUpdateArgs.AgentID = x.AgentID;
5668 m_thisAgentUpdateArgs.BodyRotation = x.BodyRotation; 5676 m_thisAgentUpdateArgs.BodyRotation = x.BodyRotation;
diff --git a/OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs b/OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs
index 766c2fe..32282af 100644
--- a/OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs
+++ b/OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs
@@ -1312,6 +1312,8 @@ namespace OpenSim.Region.ClientStack.LindenUDP
1312 if (m_discardAgentUpdates) 1312 if (m_discardAgentUpdates)
1313 return; 1313 return;
1314 1314
1315 ((LLClientView)client).TotalAgentUpdates++;
1316
1315 AgentUpdatePacket agentUpdate = (AgentUpdatePacket)packet; 1317 AgentUpdatePacket agentUpdate = (AgentUpdatePacket)packet;
1316 1318
1317 if (agentUpdate.AgentData.SessionID != client.SessionId 1319 if (agentUpdate.AgentData.SessionID != client.SessionId
diff --git a/OpenSim/Region/OptionalModules/Agent/UDP/Linden/LindenUDPInfoModule.cs b/OpenSim/Region/OptionalModules/Agent/UDP/Linden/LindenUDPInfoModule.cs
index 3e6067d..15dea17 100644
--- a/OpenSim/Region/OptionalModules/Agent/UDP/Linden/LindenUDPInfoModule.cs
+++ b/OpenSim/Region/OptionalModules/Agent/UDP/Linden/LindenUDPInfoModule.cs
@@ -611,7 +611,7 @@ namespace OpenSim.Region.OptionalModules.UDP.Linden
611 // 611 //
612 if (showParams.Length <= 4) 612 if (showParams.Length <= 4)
613 { 613 {
614 m_log.InfoFormat("[INFO]: {0,-12} {1,-20} {2,-6} {3,-11} {4,-11} {5,-16}", "Region", "Name", "Root", "Time", "Reqs/min", "Sig. AgentUpdates"); 614 m_log.InfoFormat("[INFO]: {0,-12} {1,-20} {2,-6} {3,-11} {4,-11} {5,-16}", "Region", "Name", "Root", "Time", "Reqs/min", "AgentUpdates");
615 foreach (Scene scene in m_scenes.Values) 615 foreach (Scene scene in m_scenes.Values)
616 { 616 {
617 scene.ForEachClient( 617 scene.ForEachClient(
@@ -630,9 +630,9 @@ namespace OpenSim.Region.OptionalModules.UDP.Linden
630 (DateTime.Now - cinfo.StartedTime).Minutes, 630 (DateTime.Now - cinfo.StartedTime).Minutes,
631 avg_reqs, 631 avg_reqs,
632 string.Format( 632 string.Format(
633 "{0}, {1}%", 633 "{0} ({1:0.00}%)",
634 llClient.TotalSignificantAgentUpdates, 634 llClient.TotalAgentUpdates,
635 (float)llClient.TotalSignificantAgentUpdates / cinfo.SyncRequests["AgentUpdate"] * 100)); 635 (float)cinfo.SyncRequests["AgentUpdate"] / llClient.TotalAgentUpdates * 100));
636 } 636 }
637 }); 637 });
638 } 638 }