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 65f01b3..4132ec7 100644 --- a/OpenSim/Services/Connectors/Simulation/SimulationServiceConnector.cs +++ b/OpenSim/Services/Connectors/Simulation/SimulationServiceConnector.cs | |||
@@ -348,6 +348,10 @@ namespace OpenSim.Services.Connectors.Simulation | |||
348 | return false; | 348 | return false; |
349 | } | 349 | } |
350 | 350 | ||
351 | OSDMap resp = (OSDMap)result["_Result"]; | ||
352 | success = resp["success"].AsBoolean(); | ||
353 | reason = resp["reason"].AsString(); | ||
354 | |||
351 | return success; | 355 | return success; |
352 | } | 356 | } |
353 | catch (Exception e) | 357 | catch (Exception e) |
@@ -376,9 +380,7 @@ namespace OpenSim.Services.Connectors.Simulation | |||
376 | return true; | 380 | return true; |
377 | } | 381 | } |
378 | 382 | ||
379 | /// <summary> | 383 | private bool CloseAgent(GridRegion destination, UUID id, bool ChildOnly) |
380 | /// </summary> | ||
381 | public bool CloseAgent(GridRegion destination, UUID id) | ||
382 | { | 384 | { |
383 | // m_log.DebugFormat("[REMOTE SIMULATION CONNECTOR]: CloseAgent start"); | 385 | // m_log.DebugFormat("[REMOTE SIMULATION CONNECTOR]: CloseAgent start"); |
384 | 386 | ||
@@ -396,6 +398,16 @@ namespace OpenSim.Services.Connectors.Simulation | |||
396 | return true; | 398 | return true; |
397 | } | 399 | } |
398 | 400 | ||
401 | public bool CloseChildAgent(GridRegion destination, UUID id) | ||
402 | { | ||
403 | return CloseAgent(destination, id, true); | ||
404 | } | ||
405 | |||
406 | public bool CloseAgent(GridRegion destination, UUID id) | ||
407 | { | ||
408 | return CloseAgent(destination, id, false); | ||
409 | } | ||
410 | |||
399 | #endregion Agents | 411 | #endregion Agents |
400 | 412 | ||
401 | #region Objects | 413 | #region Objects |
@@ -432,11 +444,14 @@ namespace OpenSim.Services.Connectors.Simulation | |||
432 | args["destination_name"] = OSD.FromString(destination.RegionName); | 444 | args["destination_name"] = OSD.FromString(destination.RegionName); |
433 | args["destination_uuid"] = OSD.FromString(destination.RegionID.ToString()); | 445 | args["destination_uuid"] = OSD.FromString(destination.RegionID.ToString()); |
434 | 446 | ||
435 | WebUtil.PostToService(uri, args, 40000); | 447 | OSDMap response = WebUtil.PostToService(uri, args, 40000); |
448 | if (response["Success"] == "False") | ||
449 | return false; | ||
436 | } | 450 | } |
437 | catch (Exception e) | 451 | catch (Exception e) |
438 | { | 452 | { |
439 | m_log.WarnFormat("[REMOTE SIMULATION CONNECTOR] CreateObject failed with exception; {0}",e.ToString()); | 453 | m_log.WarnFormat("[REMOTE SIMULATION CONNECTOR] CreateObject failed with exception; {0}",e.ToString()); |
454 | return false; | ||
440 | } | 455 | } |
441 | 456 | ||
442 | return true; | 457 | return true; |