diff options
| author | Justin Clark-Casey (justincc) | 2012-05-25 02:37:22 +0100 |
|---|---|---|
| committer | Justin Clark-Casey (justincc) | 2012-05-25 02:37:22 +0100 |
| commit | 96cde407ab0d40856fb10b3b9f304433ffe734a2 (patch) | |
| tree | 776c55bf6ad21506626fb2c636abfb2cf2146ed0 /OpenSim/Region/CoreModules | |
| parent | Stop it being possible for an agent to teleport back to its source region bef... (diff) | |
| download | opensim-SC_OLD-96cde407ab0d40856fb10b3b9f304433ffe734a2.zip opensim-SC_OLD-96cde407ab0d40856fb10b3b9f304433ffe734a2.tar.gz opensim-SC_OLD-96cde407ab0d40856fb10b3b9f304433ffe734a2.tar.bz2 opensim-SC_OLD-96cde407ab0d40856fb10b3b9f304433ffe734a2.tar.xz | |
Fix bug where a failed QueryAccess to a remove region would always have the reason "Communications failure" no matter what the destination region actually returned
Diffstat (limited to 'OpenSim/Region/CoreModules')
| -rw-r--r-- | OpenSim/Region/CoreModules/ServiceConnectorsOut/Simulation/RemoteSimulationConnector.cs | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Simulation/RemoteSimulationConnector.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Simulation/RemoteSimulationConnector.cs index 3d28518..f980f68 100644 --- a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Simulation/RemoteSimulationConnector.cs +++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Simulation/RemoteSimulationConnector.cs | |||
| @@ -226,13 +226,13 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Simulation | |||
| 226 | return m_remoteConnector.RetrieveAgent(destination, id, out agent); | 226 | return m_remoteConnector.RetrieveAgent(destination, id, out agent); |
| 227 | 227 | ||
| 228 | return false; | 228 | return false; |
| 229 | |||
| 230 | } | 229 | } |
| 231 | 230 | ||
| 232 | public bool QueryAccess(GridRegion destination, UUID id, Vector3 position, out string version, out string reason) | 231 | public bool QueryAccess(GridRegion destination, UUID id, Vector3 position, out string version, out string reason) |
| 233 | { | 232 | { |
| 234 | reason = "Communications failure"; | 233 | reason = "Communications failure"; |
| 235 | version = "Unknown"; | 234 | version = "Unknown"; |
| 235 | |||
| 236 | if (destination == null) | 236 | if (destination == null) |
| 237 | return false; | 237 | return false; |
| 238 | 238 | ||
| @@ -245,7 +245,6 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Simulation | |||
| 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; |
| 248 | |||
| 249 | } | 248 | } |
| 250 | 249 | ||
| 251 | public bool ReleaseAgent(UUID origin, UUID id, string uri) | 250 | public bool ReleaseAgent(UUID origin, UUID id, string uri) |