diff options
| author | Diva Canto | 2011-05-01 09:11:16 -0700 |
|---|---|---|
| committer | Diva Canto | 2011-05-01 09:11:16 -0700 |
| commit | f0bf64b6debf85440a823816b725dee7d41cedac (patch) | |
| tree | ba4155810f2b27a8e3220214d92ecd7faa0cc069 /OpenSim/Region/CoreModules | |
| parent | Added OpenSim.Capabilities.Handlers. For the moment it has only the GetTextur... (diff) | |
| parent | Increased Timeout to 30 secs. (diff) | |
| download | opensim-SC_OLD-f0bf64b6debf85440a823816b725dee7d41cedac.zip opensim-SC_OLD-f0bf64b6debf85440a823816b725dee7d41cedac.tar.gz opensim-SC_OLD-f0bf64b6debf85440a823816b725dee7d41cedac.tar.bz2 opensim-SC_OLD-f0bf64b6debf85440a823816b725dee7d41cedac.tar.xz | |
Merge branch 'master' into caps
Diffstat (limited to 'OpenSim/Region/CoreModules')
| -rw-r--r-- | OpenSim/Region/CoreModules/ServiceConnectorsOut/Simulation/RemoteSimulationConnector.cs | 4 |
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 7858f2a..f8cea71 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; |