diff options
Diffstat (limited to 'OpenSim/Services/Connectors/Simulation/SimulationServiceConnector.cs')
-rw-r--r-- | OpenSim/Services/Connectors/Simulation/SimulationServiceConnector.cs | 20 |
1 files changed, 16 insertions, 4 deletions
diff --git a/OpenSim/Services/Connectors/Simulation/SimulationServiceConnector.cs b/OpenSim/Services/Connectors/Simulation/SimulationServiceConnector.cs index 7545db8..6ce0a47 100644 --- a/OpenSim/Services/Connectors/Simulation/SimulationServiceConnector.cs +++ b/OpenSim/Services/Connectors/Simulation/SimulationServiceConnector.cs | |||
@@ -102,7 +102,7 @@ namespace OpenSim.Services.Connectors.Simulation | |||
102 | args["destination_uuid"] = OSD.FromString(destination.RegionID.ToString()); | 102 | args["destination_uuid"] = OSD.FromString(destination.RegionID.ToString()); |
103 | args["teleport_flags"] = OSD.FromString(flags.ToString()); | 103 | args["teleport_flags"] = OSD.FromString(flags.ToString()); |
104 | 104 | ||
105 | OSDMap result = WebUtil.PostToService(uri,args); | 105 | OSDMap result = WebUtil.PostToService(uri, args, 5000); |
106 | if (result["Success"].AsBoolean()) | 106 | if (result["Success"].AsBoolean()) |
107 | return true; | 107 | return true; |
108 | 108 | ||
@@ -305,6 +305,10 @@ namespace OpenSim.Services.Connectors.Simulation | |||
305 | return false; | 305 | return false; |
306 | } | 306 | } |
307 | 307 | ||
308 | OSDMap resp = (OSDMap)result["_Result"]; | ||
309 | success = resp["success"].AsBoolean(); | ||
310 | reason = resp["reason"].AsString(); | ||
311 | |||
308 | return success; | 312 | return success; |
309 | } | 313 | } |
310 | catch (Exception e) | 314 | catch (Exception e) |
@@ -333,9 +337,7 @@ namespace OpenSim.Services.Connectors.Simulation | |||
333 | return true; | 337 | return true; |
334 | } | 338 | } |
335 | 339 | ||
336 | /// <summary> | 340 | private bool CloseAgent(GridRegion destination, UUID id, bool ChildOnly) |
337 | /// </summary> | ||
338 | public bool CloseAgent(GridRegion destination, UUID id) | ||
339 | { | 341 | { |
340 | // m_log.DebugFormat("[REMOTE SIMULATION CONNECTOR]: CloseAgent start"); | 342 | // m_log.DebugFormat("[REMOTE SIMULATION CONNECTOR]: CloseAgent start"); |
341 | 343 | ||
@@ -353,6 +355,16 @@ namespace OpenSim.Services.Connectors.Simulation | |||
353 | return true; | 355 | return true; |
354 | } | 356 | } |
355 | 357 | ||
358 | public bool CloseChildAgent(GridRegion destination, UUID id) | ||
359 | { | ||
360 | return CloseAgent(destination, id, true); | ||
361 | } | ||
362 | |||
363 | public bool CloseAgent(GridRegion destination, UUID id) | ||
364 | { | ||
365 | return CloseAgent(destination, id, false); | ||
366 | } | ||
367 | |||
356 | #endregion Agents | 368 | #endregion Agents |
357 | 369 | ||
358 | #region Objects | 370 | #region Objects |