aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Services/Connectors/Simulation/SimulationServiceConnector.cs
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim/Services/Connectors/Simulation/SimulationServiceConnector.cs')
-rw-r--r--OpenSim/Services/Connectors/Simulation/SimulationServiceConnector.cs21
1 files changed, 21 insertions, 0 deletions
diff --git a/OpenSim/Services/Connectors/Simulation/SimulationServiceConnector.cs b/OpenSim/Services/Connectors/Simulation/SimulationServiceConnector.cs
index 1eedbef..28b6de7 100644
--- a/OpenSim/Services/Connectors/Simulation/SimulationServiceConnector.cs
+++ b/OpenSim/Services/Connectors/Simulation/SimulationServiceConnector.cs
@@ -112,6 +112,7 @@ namespace OpenSim.Services.Connectors.Simulation
112 112
113 if (destination == null) 113 if (destination == null)
114 { 114 {
115 reason = "Destination not found";
115 m_log.Debug("[REMOTE SIMULATION CONNECTOR]: Given destination is null"); 116 m_log.Debug("[REMOTE SIMULATION CONNECTOR]: Given destination is null");
116 return false; 117 return false;
117 } 118 }
@@ -282,7 +283,13 @@ namespace OpenSim.Services.Connectors.Simulation
282 } 283 }
283 284
284 285
286<<<<<<< HEAD
285 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
286 { 293 {
287 reason = "Failed to contact destination"; 294 reason = "Failed to contact destination";
288 version = "Unknown"; 295 version = "Unknown";
@@ -299,6 +306,7 @@ namespace OpenSim.Services.Connectors.Simulation
299 request.Add("viaTeleport", OSD.FromBoolean(viaTeleport)); 306 request.Add("viaTeleport", OSD.FromBoolean(viaTeleport));
300 request.Add("position", OSD.FromString(position.ToString())); 307 request.Add("position", OSD.FromString(position.ToString()));
301 request.Add("my_version", OSD.FromString(myversion)); 308 request.Add("my_version", OSD.FromString(myversion));
309<<<<<<< HEAD
302 310
303 OSDArray features = new OSDArray(); 311 OSDArray features = new OSDArray();
304 foreach (UUID feature in featuresAvailable) 312 foreach (UUID feature in featuresAvailable)
@@ -306,6 +314,8 @@ namespace OpenSim.Services.Connectors.Simulation
306 314
307 request.Add("features", features); 315 request.Add("features", features);
308 316
317=======
318>>>>>>> avn/ubitvar
309 if (agentHomeURI != null) 319 if (agentHomeURI != null)
310 request.Add("agent_home_uri", OSD.FromString(agentHomeURI)); 320 request.Add("agent_home_uri", OSD.FromString(agentHomeURI));
311 321
@@ -356,6 +366,7 @@ namespace OpenSim.Services.Connectors.Simulation
356 return false; 366 return false;
357 } 367 }
358 368
369<<<<<<< HEAD
359 370
360 featuresAvailable.Clear(); 371 featuresAvailable.Clear();
361 372
@@ -366,6 +377,11 @@ namespace OpenSim.Services.Connectors.Simulation
366 foreach (OSD o in array) 377 foreach (OSD o in array)
367 featuresAvailable.Add(new UUID(o.AsString())); 378 featuresAvailable.Add(new UUID(o.AsString()));
368 } 379 }
380=======
381 OSDMap resp = (OSDMap)result["_Result"];
382 success = resp["success"].AsBoolean();
383 reason = resp["reason"].AsString();
384>>>>>>> avn/ubitvar
369 385
370 return success; 386 return success;
371 } 387 }
@@ -451,12 +467,17 @@ namespace OpenSim.Services.Connectors.Simulation
451 args["destination_name"] = OSD.FromString(destination.RegionName); 467 args["destination_name"] = OSD.FromString(destination.RegionName);
452 args["destination_uuid"] = OSD.FromString(destination.RegionID.ToString()); 468 args["destination_uuid"] = OSD.FromString(destination.RegionID.ToString());
453 469
470<<<<<<< HEAD
454 OSDMap result = WebUtil.PostToService(uri, args, 40000, false); 471 OSDMap result = WebUtil.PostToService(uri, args, 40000, false);
455 472
456 if (result == null) 473 if (result == null)
457 return false; 474 return false;
458 bool success = result["success"].AsBoolean(); 475 bool success = result["success"].AsBoolean();
459 if (!success) 476 if (!success)
477=======
478 OSDMap response = WebUtil.PostToService(uri, args, 40000);
479 if (response["Success"] == "False")
480>>>>>>> avn/ubitvar
460 return false; 481 return false;
461 } 482 }
462 catch (Exception e) 483 catch (Exception e)