diff options
Merge branch 'master' into careminster
Conflicts:
OpenSim/Framework/Monitoring/BaseStatsCollector.cs
OpenSim/Region/ClientStack/Linden/Caps/WebFetchInvDescModule.cs
OpenSim/Region/CoreModules/Avatar/InstantMessage/OfflineMessageModule.cs
OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
Diffstat (limited to 'OpenSim/Region/CoreModules/ServiceConnectorsOut')
-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 c8698ca..f7dae59 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; |
@@ -288,7 +288,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Simulation | |||
288 | return true; | 288 | return true; |
289 | 289 | ||
290 | // else do the remote thing | 290 | // else do the remote thing |
291 | if (!m_localBackend.IsLocalRegion(destination.RegionHandle)) | 291 | if (!m_localBackend.IsLocalRegion(destination.RegionID)) |
292 | return m_remoteConnector.CloseAgent(destination, id); | 292 | return m_remoteConnector.CloseAgent(destination, id); |
293 | 293 | ||
294 | return false; | 294 | return false; |
@@ -311,7 +311,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Simulation | |||
311 | } | 311 | } |
312 | 312 | ||
313 | // else do the remote thing | 313 | // else do the remote thing |
314 | if (!m_localBackend.IsLocalRegion(destination.RegionHandle)) | 314 | if (!m_localBackend.IsLocalRegion(destination.RegionID)) |
315 | return m_remoteConnector.CreateObject(destination, newPosition, sog, isLocalCall); | 315 | return m_remoteConnector.CreateObject(destination, newPosition, sog, isLocalCall); |
316 | 316 | ||
317 | return false; | 317 | return false; |