diff options
Diffstat (limited to 'OpenSim/Services/Connectors/Simulation')
-rw-r--r-- | OpenSim/Services/Connectors/Simulation/SimulationServiceConnector.cs | 24 |
1 files changed, 2 insertions, 22 deletions
diff --git a/OpenSim/Services/Connectors/Simulation/SimulationServiceConnector.cs b/OpenSim/Services/Connectors/Simulation/SimulationServiceConnector.cs index 28b6de7..493d7e0 100644 --- a/OpenSim/Services/Connectors/Simulation/SimulationServiceConnector.cs +++ b/OpenSim/Services/Connectors/Simulation/SimulationServiceConnector.cs | |||
@@ -283,13 +283,8 @@ namespace OpenSim.Services.Connectors.Simulation | |||
283 | } | 283 | } |
284 | 284 | ||
285 | 285 | ||
286 | <<<<<<< HEAD | 286 | |
287 | public bool QueryAccess(GridRegion destination, UUID agentID, string agentHomeURI, bool viaTeleport, Vector3 position, string myversion, List<UUID> featuresAvailable, out string version, out string reason) | 287 | public bool QueryAccess(GridRegion destination, UUID agentID, string agentHomeURI, bool viaTeleport, Vector3 position, string myversion, List<UUID> featuresAvailable, out string version, out string reason) |
288 | ======= | ||
289 | /// <summary> | ||
290 | /// </summary> | ||
291 | public bool QueryAccess(GridRegion destination, UUID agentID, string agentHomeURI, bool viaTeleport, Vector3 position, string myversion, out string version, out string reason) | ||
292 | >>>>>>> avn/ubitvar | ||
293 | { | 288 | { |
294 | reason = "Failed to contact destination"; | 289 | reason = "Failed to contact destination"; |
295 | version = "Unknown"; | 290 | version = "Unknown"; |
@@ -306,7 +301,6 @@ namespace OpenSim.Services.Connectors.Simulation | |||
306 | request.Add("viaTeleport", OSD.FromBoolean(viaTeleport)); | 301 | request.Add("viaTeleport", OSD.FromBoolean(viaTeleport)); |
307 | request.Add("position", OSD.FromString(position.ToString())); | 302 | request.Add("position", OSD.FromString(position.ToString())); |
308 | request.Add("my_version", OSD.FromString(myversion)); | 303 | request.Add("my_version", OSD.FromString(myversion)); |
309 | <<<<<<< HEAD | ||
310 | 304 | ||
311 | OSDArray features = new OSDArray(); | 305 | OSDArray features = new OSDArray(); |
312 | foreach (UUID feature in featuresAvailable) | 306 | foreach (UUID feature in featuresAvailable) |
@@ -314,8 +308,6 @@ namespace OpenSim.Services.Connectors.Simulation | |||
314 | 308 | ||
315 | request.Add("features", features); | 309 | request.Add("features", features); |
316 | 310 | ||
317 | ======= | ||
318 | >>>>>>> avn/ubitvar | ||
319 | if (agentHomeURI != null) | 311 | if (agentHomeURI != null) |
320 | request.Add("agent_home_uri", OSD.FromString(agentHomeURI)); | 312 | request.Add("agent_home_uri", OSD.FromString(agentHomeURI)); |
321 | 313 | ||
@@ -366,8 +358,6 @@ namespace OpenSim.Services.Connectors.Simulation | |||
366 | return false; | 358 | return false; |
367 | } | 359 | } |
368 | 360 | ||
369 | <<<<<<< HEAD | ||
370 | |||
371 | featuresAvailable.Clear(); | 361 | featuresAvailable.Clear(); |
372 | 362 | ||
373 | if (result.ContainsKey("features")) | 363 | if (result.ContainsKey("features")) |
@@ -377,12 +367,6 @@ namespace OpenSim.Services.Connectors.Simulation | |||
377 | foreach (OSD o in array) | 367 | foreach (OSD o in array) |
378 | featuresAvailable.Add(new UUID(o.AsString())); | 368 | featuresAvailable.Add(new UUID(o.AsString())); |
379 | } | 369 | } |
380 | ======= | ||
381 | OSDMap resp = (OSDMap)result["_Result"]; | ||
382 | success = resp["success"].AsBoolean(); | ||
383 | reason = resp["reason"].AsString(); | ||
384 | >>>>>>> avn/ubitvar | ||
385 | |||
386 | return success; | 370 | return success; |
387 | } | 371 | } |
388 | catch (Exception e) | 372 | catch (Exception e) |
@@ -467,17 +451,13 @@ namespace OpenSim.Services.Connectors.Simulation | |||
467 | args["destination_name"] = OSD.FromString(destination.RegionName); | 451 | args["destination_name"] = OSD.FromString(destination.RegionName); |
468 | args["destination_uuid"] = OSD.FromString(destination.RegionID.ToString()); | 452 | args["destination_uuid"] = OSD.FromString(destination.RegionID.ToString()); |
469 | 453 | ||
470 | <<<<<<< HEAD | 454 | |
471 | OSDMap result = WebUtil.PostToService(uri, args, 40000, false); | 455 | OSDMap result = WebUtil.PostToService(uri, args, 40000, false); |
472 | 456 | ||
473 | if (result == null) | 457 | if (result == null) |
474 | return false; | 458 | return false; |
475 | bool success = result["success"].AsBoolean(); | 459 | bool success = result["success"].AsBoolean(); |
476 | if (!success) | 460 | if (!success) |
477 | ======= | ||
478 | OSDMap response = WebUtil.PostToService(uri, args, 40000); | ||
479 | if (response["Success"] == "False") | ||
480 | >>>>>>> avn/ubitvar | ||
481 | return false; | 461 | return false; |
482 | } | 462 | } |
483 | catch (Exception e) | 463 | catch (Exception e) |