diff options
Diffstat (limited to 'OpenSim/Services/Connectors/Simulation/SimulationServiceConnector.cs')
-rw-r--r-- | OpenSim/Services/Connectors/Simulation/SimulationServiceConnector.cs | 23 |
1 files changed, 19 insertions, 4 deletions
diff --git a/OpenSim/Services/Connectors/Simulation/SimulationServiceConnector.cs b/OpenSim/Services/Connectors/Simulation/SimulationServiceConnector.cs index 95c4f87..cd93386 100644 --- a/OpenSim/Services/Connectors/Simulation/SimulationServiceConnector.cs +++ b/OpenSim/Services/Connectors/Simulation/SimulationServiceConnector.cs | |||
@@ -359,6 +359,10 @@ namespace OpenSim.Services.Connectors.Simulation | |||
359 | return false; | 359 | return false; |
360 | } | 360 | } |
361 | 361 | ||
362 | OSDMap resp = (OSDMap)result["_Result"]; | ||
363 | success = resp["success"].AsBoolean(); | ||
364 | reason = resp["reason"].AsString(); | ||
365 | |||
362 | return success; | 366 | return success; |
363 | } | 367 | } |
364 | catch (Exception e) | 368 | catch (Exception e) |
@@ -387,9 +391,7 @@ namespace OpenSim.Services.Connectors.Simulation | |||
387 | return true; | 391 | return true; |
388 | } | 392 | } |
389 | 393 | ||
390 | /// <summary> | 394 | private bool CloseAgent(GridRegion destination, UUID id, bool ChildOnly) |
391 | /// </summary> | ||
392 | public bool CloseAgent(GridRegion destination, UUID id) | ||
393 | { | 395 | { |
394 | // m_log.DebugFormat("[REMOTE SIMULATION CONNECTOR]: CloseAgent start"); | 396 | // m_log.DebugFormat("[REMOTE SIMULATION CONNECTOR]: CloseAgent start"); |
395 | 397 | ||
@@ -407,6 +409,16 @@ namespace OpenSim.Services.Connectors.Simulation | |||
407 | return true; | 409 | return true; |
408 | } | 410 | } |
409 | 411 | ||
412 | public bool CloseChildAgent(GridRegion destination, UUID id) | ||
413 | { | ||
414 | return CloseAgent(destination, id, true); | ||
415 | } | ||
416 | |||
417 | public bool CloseAgent(GridRegion destination, UUID id) | ||
418 | { | ||
419 | return CloseAgent(destination, id, false); | ||
420 | } | ||
421 | |||
410 | #endregion Agents | 422 | #endregion Agents |
411 | 423 | ||
412 | #region Objects | 424 | #region Objects |
@@ -444,11 +456,14 @@ namespace OpenSim.Services.Connectors.Simulation | |||
444 | args["destination_name"] = OSD.FromString(destination.RegionName); | 456 | args["destination_name"] = OSD.FromString(destination.RegionName); |
445 | args["destination_uuid"] = OSD.FromString(destination.RegionID.ToString()); | 457 | args["destination_uuid"] = OSD.FromString(destination.RegionID.ToString()); |
446 | 458 | ||
447 | WebUtil.PostToService(uri, args, 40000); | 459 | OSDMap response = WebUtil.PostToService(uri, args, 40000); |
460 | if (response["Success"] == "False") | ||
461 | return false; | ||
448 | } | 462 | } |
449 | catch (Exception e) | 463 | catch (Exception e) |
450 | { | 464 | { |
451 | m_log.WarnFormat("[REMOTE SIMULATION CONNECTOR] CreateObject failed with exception; {0}",e.ToString()); | 465 | m_log.WarnFormat("[REMOTE SIMULATION CONNECTOR] CreateObject failed with exception; {0}",e.ToString()); |
466 | return false; | ||
452 | } | 467 | } |
453 | 468 | ||
454 | return true; | 469 | return true; |