diff options
author | Justin Clark-Casey (justincc) | 2013-07-19 00:56:45 +0100 |
---|---|---|
committer | Diva Canto | 2013-07-21 08:59:17 -0700 |
commit | 866de5397890edbc0355b1925bf8537b40bab6a3 (patch) | |
tree | 0f087dcca86eb0bc0ccf153600cbf46c1f062b98 | |
parent | Make the check as to whether any particular inbound AgentUpdate packet is sig... (diff) | |
download | opensim-SC-866de5397890edbc0355b1925bf8537b40bab6a3.zip opensim-SC-866de5397890edbc0355b1925bf8537b40bab6a3.tar.gz opensim-SC-866de5397890edbc0355b1925bf8537b40bab6a3.tar.bz2 opensim-SC-866de5397890edbc0355b1925bf8537b40bab6a3.tar.xz |
Remove some pointless code in CheckAgentUpdateSignificance()
-rw-r--r-- | OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs | 50 |
1 files changed, 20 insertions, 30 deletions
diff --git a/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs b/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs index 7e5511f..c5bb697 100644 --- a/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs +++ b/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs | |||
@@ -5574,40 +5574,30 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
5574 | /// <summary> | 5574 | /// <summary> |
5575 | /// This checks the update significance against the last update made. | 5575 | /// This checks the update significance against the last update made. |
5576 | /// </summary> | 5576 | /// </summary> |
5577 | /// <remarks>Can only be called by one thread at a time, and not at the same time as </remarks> | 5577 | /// <remarks>Can only be called by one thread at a time</remarks> |
5578 | /// | ||
5579 | /// <returns>/returns> | 5578 | /// <returns>/returns> |
5580 | /// <param name='x'></param> | 5579 | /// <param name='x'></param> |
5581 | public bool CheckAgentUpdateSignificance(AgentUpdatePacket.AgentDataBlock x) | 5580 | public bool CheckAgentUpdateSignificance(AgentUpdatePacket.AgentDataBlock x) |
5582 | { | 5581 | { |
5583 | bool update = false; | 5582 | // These should be ordered from most-likely to |
5584 | 5583 | // least likely to change. I've made an initial | |
5585 | if (m_lastAgentUpdateArgs != null) | 5584 | // guess at that. |
5586 | { | 5585 | bool update = |
5587 | // These should be ordered from most-likely to | 5586 | ( |
5588 | // least likely to change. I've made an initial | 5587 | (x.BodyRotation != m_lastAgentUpdateArgs.BodyRotation) || |
5589 | // guess at that. | 5588 | (x.CameraAtAxis != m_lastAgentUpdateArgs.CameraAtAxis) || |
5590 | update = | 5589 | (x.CameraCenter != m_lastAgentUpdateArgs.CameraCenter) || |
5591 | ( | 5590 | (x.CameraLeftAxis != m_lastAgentUpdateArgs.CameraLeftAxis) || |
5592 | (x.BodyRotation != m_lastAgentUpdateArgs.BodyRotation) || | 5591 | (x.CameraUpAxis != m_lastAgentUpdateArgs.CameraUpAxis) || |
5593 | (x.CameraAtAxis != m_lastAgentUpdateArgs.CameraAtAxis) || | 5592 | (x.ControlFlags != m_lastAgentUpdateArgs.ControlFlags) || |
5594 | (x.CameraCenter != m_lastAgentUpdateArgs.CameraCenter) || | 5593 | (x.Far != m_lastAgentUpdateArgs.Far) || |
5595 | (x.CameraLeftAxis != m_lastAgentUpdateArgs.CameraLeftAxis) || | 5594 | (x.Flags != m_lastAgentUpdateArgs.Flags) || |
5596 | (x.CameraUpAxis != m_lastAgentUpdateArgs.CameraUpAxis) || | 5595 | (x.State != m_lastAgentUpdateArgs.State) || |
5597 | (x.ControlFlags != m_lastAgentUpdateArgs.ControlFlags) || | 5596 | (x.HeadRotation != m_lastAgentUpdateArgs.HeadRotation) || |
5598 | (x.Far != m_lastAgentUpdateArgs.Far) || | 5597 | (x.SessionID != m_lastAgentUpdateArgs.SessionID) || |
5599 | (x.Flags != m_lastAgentUpdateArgs.Flags) || | 5598 | (x.AgentID != m_lastAgentUpdateArgs.AgentID) |
5600 | (x.State != m_lastAgentUpdateArgs.State) || | 5599 | ); |
5601 | (x.HeadRotation != m_lastAgentUpdateArgs.HeadRotation) || | 5600 | |
5602 | (x.SessionID != m_lastAgentUpdateArgs.SessionID) || | ||
5603 | (x.AgentID != m_lastAgentUpdateArgs.AgentID) | ||
5604 | ); | ||
5605 | } | ||
5606 | else | ||
5607 | { | ||
5608 | m_lastAgentUpdateArgs = new AgentUpdateArgs(); | ||
5609 | update = true; | ||
5610 | } | ||
5611 | 5601 | ||
5612 | if (update) | 5602 | if (update) |
5613 | { | 5603 | { |