diff options
Diffstat (limited to 'OpenSim')
| -rw-r--r-- | OpenSim/Region/CoreModules/ServiceConnectorsOut/Simulation/RemoteSimulationConnector.cs | 22 |
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 | |||
| 192 | return false; | 192 | return false; |
| 193 | 193 | ||
| 194 | // Try local first | 194 | // Try local first |
| 195 | if (m_localBackend.UpdateAgent(destination, cAgentData)) | 195 | if (m_localBackend.IsLocalRegion(destination.RegionHandle)) |
| 196 | return true; | 196 | return m_localBackend.UpdateAgent(destination, cAgentData); |
| 197 | |||
| 198 | // else do the remote thing | ||
| 199 | if (!m_localBackend.IsLocalRegion(destination.RegionHandle)) | ||
| 200 | return m_remoteConnector.UpdateAgent(destination, cAgentData); | ||
| 201 | |||
| 202 | return false; | ||
| 203 | 197 | ||
| 198 | return m_remoteConnector.UpdateAgent(destination, cAgentData); | ||
| 204 | } | 199 | } |
| 205 | 200 | ||
| 206 | public bool UpdateAgent(GridRegion destination, AgentPosition cAgentData) | 201 | public bool UpdateAgent(GridRegion destination, AgentPosition cAgentData) |
| @@ -209,15 +204,10 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Simulation | |||
| 209 | return false; | 204 | return false; |
| 210 | 205 | ||
| 211 | // Try local first | 206 | // Try local first |
| 212 | if (m_localBackend.UpdateAgent(destination, cAgentData)) | 207 | if (m_localBackend.IsLocalRegion(destination.RegionHandle)) |
| 213 | return true; | 208 | return m_localBackend.UpdateAgent(destination, cAgentData); |
| 214 | |||
| 215 | // else do the remote thing | ||
| 216 | if (!m_localBackend.IsLocalRegion(destination.RegionHandle)) | ||
| 217 | return m_remoteConnector.UpdateAgent(destination, cAgentData); | ||
| 218 | |||
| 219 | return false; | ||
| 220 | 209 | ||
| 210 | return m_remoteConnector.UpdateAgent(destination, cAgentData); | ||
| 221 | } | 211 | } |
| 222 | 212 | ||
| 223 | public bool RetrieveAgent(GridRegion destination, UUID id, out IAgentData agent) | 213 | public bool RetrieveAgent(GridRegion destination, UUID id, out IAgentData agent) |