diff options
author | Melanie | 2011-01-28 04:31:21 +0100 |
---|---|---|
committer | Melanie | 2011-01-28 05:25:53 +0000 |
commit | ab48caad0804728ad939470a7120978a2566ee1e (patch) | |
tree | d2e07bdc3895ded403ee3a070ed26e099a98c243 /OpenSim/Services/Connectors/Simulation/SimulationServiceConnector.cs | |
parent | Fix up QueryAccess to also check parcels (diff) | |
download | opensim-SC_OLD-ab48caad0804728ad939470a7120978a2566ee1e.zip opensim-SC_OLD-ab48caad0804728ad939470a7120978a2566ee1e.tar.gz opensim-SC_OLD-ab48caad0804728ad939470a7120978a2566ee1e.tar.bz2 opensim-SC_OLD-ab48caad0804728ad939470a7120978a2566ee1e.tar.xz |
Make the new style stuff compatible with the older revision
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Services/Connectors/Simulation/SimulationServiceConnector.cs | 15 |
1 files changed, 14 insertions, 1 deletions
diff --git a/OpenSim/Services/Connectors/Simulation/SimulationServiceConnector.cs b/OpenSim/Services/Connectors/Simulation/SimulationServiceConnector.cs index 775bded..c5313fc 100644 --- a/OpenSim/Services/Connectors/Simulation/SimulationServiceConnector.cs +++ b/OpenSim/Services/Connectors/Simulation/SimulationServiceConnector.cs | |||
@@ -223,7 +223,20 @@ namespace OpenSim.Services.Connectors.Simulation | |||
223 | try | 223 | try |
224 | { | 224 | { |
225 | OSDMap result = WebUtil.ServiceOSDRequest(uri, request, "QUERYACCESS", 10000); | 225 | OSDMap result = WebUtil.ServiceOSDRequest(uri, request, "QUERYACCESS", 10000); |
226 | return result["Success"].AsBoolean(); | 226 | bool success = result["Success"].AsBoolean(); |
227 | if (!success) | ||
228 | { | ||
229 | if (result.ContainsKey("Message")) | ||
230 | { | ||
231 | string message = result["Message"].AsString(); | ||
232 | if (message == "Service request failed: [MethodNotAllowed] MethodNotAllowed") // Old style region | ||
233 | { | ||
234 | m_log.Info("[REMOTE SIMULATION CONNECTOR]: The above web util error was caused by a TP to a sim that doesn't support QUERYACCESS and can be ignored"); | ||
235 | return true; | ||
236 | } | ||
237 | } | ||
238 | } | ||
239 | return success; | ||
227 | } | 240 | } |
228 | catch (Exception e) | 241 | catch (Exception e) |
229 | { | 242 | { |