aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/CoreModules/ServiceConnectorsOut/Simulation
diff options
context:
space:
mode:
authorMelanie2011-05-03 14:26:18 +0100
committerMelanie2011-05-03 14:26:18 +0100
commitaf55eda16b1025796a61289a0ab84b26e6444627 (patch)
tree6449c15b8f54240cfef62d606fab88a185f75f03 /OpenSim/Region/CoreModules/ServiceConnectorsOut/Simulation
parentMerge branch 'master' into careminster-presence-refactor (diff)
parentIncreased timeout for fat UpdateAgent to 200secs. Nebadon's 3800-prim alien a... (diff)
downloadopensim-SC-af55eda16b1025796a61289a0ab84b26e6444627.zip
opensim-SC-af55eda16b1025796a61289a0ab84b26e6444627.tar.gz
opensim-SC-af55eda16b1025796a61289a0ab84b26e6444627.tar.bz2
opensim-SC-af55eda16b1025796a61289a0ab84b26e6444627.tar.xz
Merge branch 'master' into careminster-presence-refactor
Diffstat (limited to 'OpenSim/Region/CoreModules/ServiceConnectorsOut/Simulation')
-rw-r--r--OpenSim/Region/CoreModules/ServiceConnectorsOut/Simulation/RemoteSimulationConnector.cs4
1 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Simulation/RemoteSimulationConnector.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Simulation/RemoteSimulationConnector.cs
index 5564067..391b1a1 100644
--- a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Simulation/RemoteSimulationConnector.cs
+++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Simulation/RemoteSimulationConnector.cs
@@ -179,7 +179,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Simulation
179 return true; 179 return true;
180 180
181 // else do the remote thing 181 // else do the remote thing
182 if (!m_localBackend.IsLocalRegion(destination.RegionHandle)) 182 if (!m_localBackend.IsLocalRegion(destination.RegionID))
183 { 183 {
184 return m_remoteConnector.CreateAgent(destination, aCircuit, teleportFlags, out reason); 184 return m_remoteConnector.CreateAgent(destination, aCircuit, teleportFlags, out reason);
185 } 185 }
@@ -241,7 +241,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Simulation
241 return true; 241 return true;
242 242
243 // else do the remote thing 243 // else do the remote thing
244 if (!m_localBackend.IsLocalRegion(destination.RegionHandle)) 244 if (!m_localBackend.IsLocalRegion(destination.RegionID))
245 return m_remoteConnector.QueryAccess(destination, id, position, out version, out reason); 245 return m_remoteConnector.QueryAccess(destination, id, position, out version, out reason);
246 246
247 return false; 247 return false;