diff --git a/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs b/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
index 7e5511fa2e..c5bb697ed0 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
///
/// This checks the update significance against the last update made.
///
- /// Can only be called by one thread at a time, and not at the same time as
- ///
+ /// Can only be called by one thread at a time
/// /returns>
///
public bool CheckAgentUpdateSignificance(AgentUpdatePacket.AgentDataBlock x)
{
- bool update = false;
+ // These should be ordered from most-likely to
+ // least likely to change. I've made an initial
+ // guess at that.
+ bool update =
+ (
+ (x.BodyRotation != m_lastAgentUpdateArgs.BodyRotation) ||
+ (x.CameraAtAxis != m_lastAgentUpdateArgs.CameraAtAxis) ||
+ (x.CameraCenter != m_lastAgentUpdateArgs.CameraCenter) ||
+ (x.CameraLeftAxis != m_lastAgentUpdateArgs.CameraLeftAxis) ||
+ (x.CameraUpAxis != m_lastAgentUpdateArgs.CameraUpAxis) ||
+ (x.ControlFlags != m_lastAgentUpdateArgs.ControlFlags) ||
+ (x.Far != m_lastAgentUpdateArgs.Far) ||
+ (x.Flags != m_lastAgentUpdateArgs.Flags) ||
+ (x.State != m_lastAgentUpdateArgs.State) ||
+ (x.HeadRotation != m_lastAgentUpdateArgs.HeadRotation) ||
+ (x.SessionID != m_lastAgentUpdateArgs.SessionID) ||
+ (x.AgentID != m_lastAgentUpdateArgs.AgentID)
+ );
- if (m_lastAgentUpdateArgs != null)
- {
- // These should be ordered from most-likely to
- // least likely to change. I've made an initial
- // guess at that.
- update =
- (
- (x.BodyRotation != m_lastAgentUpdateArgs.BodyRotation) ||
- (x.CameraAtAxis != m_lastAgentUpdateArgs.CameraAtAxis) ||
- (x.CameraCenter != m_lastAgentUpdateArgs.CameraCenter) ||
- (x.CameraLeftAxis != m_lastAgentUpdateArgs.CameraLeftAxis) ||
- (x.CameraUpAxis != m_lastAgentUpdateArgs.CameraUpAxis) ||
- (x.ControlFlags != m_lastAgentUpdateArgs.ControlFlags) ||
- (x.Far != m_lastAgentUpdateArgs.Far) ||
- (x.Flags != m_lastAgentUpdateArgs.Flags) ||
- (x.State != m_lastAgentUpdateArgs.State) ||
- (x.HeadRotation != m_lastAgentUpdateArgs.HeadRotation) ||
- (x.SessionID != m_lastAgentUpdateArgs.SessionID) ||
- (x.AgentID != m_lastAgentUpdateArgs.AgentID)
- );
- }
- else
- {
- m_lastAgentUpdateArgs = new AgentUpdateArgs();
- update = true;
- }
if (update)
{