Changed order of checks for local regions when processing

AgentUpdate messages. Should improve throttles and reprioritization
when an avatar is moving.

1 files changed, 6 insertions, 16 deletions

diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Simulation/RemoteSimulationConnector.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Simulation/RemoteSimulationConnector.cs
index 0c92bd1..67f4d60 100644
--- a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Simulation/RemoteSimulationConnector.cs
+++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Simulation/RemoteSimulationConnector.cs
@@ -192,15 +192,10 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Simulation
                 return false;
 
             // Try local first
-            if (m_localBackend.UpdateAgent(destination, cAgentData))
-                return true;
-
-            // else do the remote thing
-            if (!m_localBackend.IsLocalRegion(destination.RegionHandle))
-                return m_remoteConnector.UpdateAgent(destination, cAgentData);
-
-            return false;
+            if (m_localBackend.IsLocalRegion(destination.RegionHandle))
+                return m_localBackend.UpdateAgent(destination, cAgentData);
 
+            return m_remoteConnector.UpdateAgent(destination, cAgentData);
         }
 
         public bool UpdateAgent(GridRegion destination, AgentPosition cAgentData)
@@ -209,15 +204,10 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Simulation
                 return false;
 
             // Try local first
-            if (m_localBackend.UpdateAgent(destination, cAgentData))
-                return true;
-
-            // else do the remote thing
-            if (!m_localBackend.IsLocalRegion(destination.RegionHandle))
-                return m_remoteConnector.UpdateAgent(destination, cAgentData);
-
-            return false;
+            if (m_localBackend.IsLocalRegion(destination.RegionHandle))
+                return m_localBackend.UpdateAgent(destination, cAgentData);
 
+            return m_remoteConnector.UpdateAgent(destination, cAgentData);
         }
 
         public bool RetrieveAgent(GridRegion destination, UUID id, out IAgentData agent)