aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorJustin Clark-Casey (justincc)2013-07-19 01:00:38 +0100
committerDiva Canto2013-07-21 08:59:31 -0700
commit3a6acbcc149fb359c2be2ee2c646c9b15809c01e (patch)
treec4d3a4e7faecfcb0df19e688abe10624c5e08f88
parentRemove some pointless code in CheckAgentUpdateSignificance() (diff)
downloadopensim-SC_OLD-3a6acbcc149fb359c2be2ee2c646c9b15809c01e.zip
opensim-SC_OLD-3a6acbcc149fb359c2be2ee2c646c9b15809c01e.tar.gz
opensim-SC_OLD-3a6acbcc149fb359c2be2ee2c646c9b15809c01e.tar.bz2
opensim-SC_OLD-3a6acbcc149fb359c2be2ee2c646c9b15809c01e.tar.xz
furhter shorten CheckAgentUpdateSignificance(). No real perf impact.
-rw-r--r--OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs12
1 files changed, 5 insertions, 7 deletions
diff --git a/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs b/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
index c5bb697..3d085c3 100644
--- a/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
+++ b/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
@@ -5582,8 +5582,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
5582 // These should be ordered from most-likely to 5582 // These should be ordered from most-likely to
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 bool update = 5585 if (
5586 (
5587 (x.BodyRotation != m_lastAgentUpdateArgs.BodyRotation) || 5586 (x.BodyRotation != m_lastAgentUpdateArgs.BodyRotation) ||
5588 (x.CameraAtAxis != m_lastAgentUpdateArgs.CameraAtAxis) || 5587 (x.CameraAtAxis != m_lastAgentUpdateArgs.CameraAtAxis) ||
5589 (x.CameraCenter != m_lastAgentUpdateArgs.CameraCenter) || 5588 (x.CameraCenter != m_lastAgentUpdateArgs.CameraCenter) ||
@@ -5596,10 +5595,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
5596 (x.HeadRotation != m_lastAgentUpdateArgs.HeadRotation) || 5595 (x.HeadRotation != m_lastAgentUpdateArgs.HeadRotation) ||
5597 (x.SessionID != m_lastAgentUpdateArgs.SessionID) || 5596 (x.SessionID != m_lastAgentUpdateArgs.SessionID) ||
5598 (x.AgentID != m_lastAgentUpdateArgs.AgentID) 5597 (x.AgentID != m_lastAgentUpdateArgs.AgentID)
5599 ); 5598 )
5600
5601
5602 if (update)
5603 { 5599 {
5604// m_log.DebugFormat("[LLCLIENTVIEW]: Triggered AgentUpdate for {0}", sener.Name); 5600// m_log.DebugFormat("[LLCLIENTVIEW]: Triggered AgentUpdate for {0}", sener.Name);
5605 TotalSignificantAgentUpdates++; 5601 TotalSignificantAgentUpdates++;
@@ -5616,9 +5612,11 @@ namespace OpenSim.Region.ClientStack.LindenUDP
5616 m_lastAgentUpdateArgs.HeadRotation = x.HeadRotation; 5612 m_lastAgentUpdateArgs.HeadRotation = x.HeadRotation;
5617 m_lastAgentUpdateArgs.SessionID = x.SessionID; 5613 m_lastAgentUpdateArgs.SessionID = x.SessionID;
5618 m_lastAgentUpdateArgs.State = x.State; 5614 m_lastAgentUpdateArgs.State = x.State;
5615
5616 return true;
5619 } 5617 }
5620 5618
5621 return update; 5619 return false;
5622 } 5620 }
5623 5621
5624 private bool HandleAgentUpdate(IClientAPI sener, Packet packet) 5622 private bool HandleAgentUpdate(IClientAPI sener, Packet packet)