diff options
| author | Diva Canto | 2013-06-22 08:29:06 -0700 |
|---|---|---|
| committer | Diva Canto | 2013-06-22 08:29:06 -0700 |
| commit | 6c7e33fe472014688837b993118fc48878f134ff (patch) | |
| tree | 0ca3e00d18685d6064ceda47d3e583fd706fe69b /OpenSim/Region | |
| parent | HG: avoid call on localhost between sim and UAS for standalone. (diff) | |
| download | opensim-SC_OLD-6c7e33fe472014688837b993118fc48878f134ff.zip opensim-SC_OLD-6c7e33fe472014688837b993118fc48878f134ff.tar.gz opensim-SC_OLD-6c7e33fe472014688837b993118fc48878f134ff.tar.bz2 opensim-SC_OLD-6c7e33fe472014688837b993118fc48878f134ff.tar.xz | |
Change IsLocalRegion from using region handle to using regionID. This was affecting UpdateAgent and CloseAgent in cases where the foreign region is on the same coordinates as *some* local region.
Diffstat (limited to 'OpenSim/Region')
| -rw-r--r-- | OpenSim/Region/CoreModules/ServiceConnectorsOut/Simulation/RemoteSimulationConnector.cs | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Simulation/RemoteSimulationConnector.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Simulation/RemoteSimulationConnector.cs index b2a1b23..d120e11 100644 --- a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Simulation/RemoteSimulationConnector.cs +++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Simulation/RemoteSimulationConnector.cs | |||
| @@ -194,7 +194,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Simulation | |||
| 194 | return false; | 194 | return false; |
| 195 | 195 | ||
| 196 | // Try local first | 196 | // Try local first |
| 197 | if (m_localBackend.IsLocalRegion(destination.RegionHandle)) | 197 | if (m_localBackend.IsLocalRegion(destination.RegionID)) |
| 198 | return m_localBackend.UpdateAgent(destination, cAgentData); | 198 | return m_localBackend.UpdateAgent(destination, cAgentData); |
| 199 | 199 | ||
| 200 | return m_remoteConnector.UpdateAgent(destination, cAgentData); | 200 | return m_remoteConnector.UpdateAgent(destination, cAgentData); |
| @@ -206,7 +206,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Simulation | |||
| 206 | return false; | 206 | return false; |
| 207 | 207 | ||
| 208 | // Try local first | 208 | // Try local first |
| 209 | if (m_localBackend.IsLocalRegion(destination.RegionHandle)) | 209 | if (m_localBackend.IsLocalRegion(destination.RegionID)) |
| 210 | return m_localBackend.UpdateAgent(destination, cAgentData); | 210 | return m_localBackend.UpdateAgent(destination, cAgentData); |
| 211 | 211 | ||
| 212 | return m_remoteConnector.UpdateAgent(destination, cAgentData); | 212 | return m_remoteConnector.UpdateAgent(destination, cAgentData); |
| @@ -224,7 +224,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Simulation | |||
| 224 | return true; | 224 | return true; |
| 225 | 225 | ||
| 226 | // else do the remote thing | 226 | // else do the remote thing |
| 227 | if (!m_localBackend.IsLocalRegion(destination.RegionHandle)) | 227 | if (!m_localBackend.IsLocalRegion(destination.RegionID)) |
| 228 | return m_remoteConnector.RetrieveAgent(destination, id, out agent); | 228 | return m_remoteConnector.RetrieveAgent(destination, id, out agent); |
| 229 | 229 | ||
| 230 | return false; | 230 | return false; |
| @@ -273,7 +273,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Simulation | |||
| 273 | return true; | 273 | return true; |
| 274 | 274 | ||
| 275 | // else do the remote thing | 275 | // else do the remote thing |
| 276 | if (!m_localBackend.IsLocalRegion(destination.RegionHandle)) | 276 | if (!m_localBackend.IsLocalRegion(destination.RegionID)) |
| 277 | return m_remoteConnector.CloseAgent(destination, id); | 277 | return m_remoteConnector.CloseAgent(destination, id); |
| 278 | 278 | ||
| 279 | return false; | 279 | return false; |
| @@ -296,7 +296,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Simulation | |||
| 296 | } | 296 | } |
| 297 | 297 | ||
| 298 | // else do the remote thing | 298 | // else do the remote thing |
| 299 | if (!m_localBackend.IsLocalRegion(destination.RegionHandle)) | 299 | if (!m_localBackend.IsLocalRegion(destination.RegionID)) |
| 300 | return m_remoteConnector.CreateObject(destination, newPosition, sog, isLocalCall); | 300 | return m_remoteConnector.CreateObject(destination, newPosition, sog, isLocalCall); |
| 301 | 301 | ||
| 302 | return false; | 302 | return false; |