aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorMelanie2011-01-28 04:31:21 +0100
committerMelanie2011-01-28 04:31:21 +0100
commitd91ee131b944619de52448c1c0a3b87c6e5f4b9e (patch)
tree49329d2b0a53ac2898941c1f0d94af9d916d660a
parentMerge branch 'careminster-presence-refactor' of ssh://3dhosting.de/var/git/ca... (diff)
downloadopensim-SC-d91ee131b944619de52448c1c0a3b87c6e5f4b9e.zip
opensim-SC-d91ee131b944619de52448c1c0a3b87c6e5f4b9e.tar.gz
opensim-SC-d91ee131b944619de52448c1c0a3b87c6e5f4b9e.tar.bz2
opensim-SC-d91ee131b944619de52448c1c0a3b87c6e5f4b9e.tar.xz
Make the new style stuff compatible with the older revision
-rw-r--r--OpenSim/Services/Connectors/Simulation/SimulationServiceConnector.cs15
1 files changed, 14 insertions, 1 deletions
diff --git a/OpenSim/Services/Connectors/Simulation/SimulationServiceConnector.cs b/OpenSim/Services/Connectors/Simulation/SimulationServiceConnector.cs
index 752d552..2c8277f 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 {