diff options
Diffstat (limited to 'OpenSim/Services/Connectors/Simulation')
-rw-r--r-- | OpenSim/Services/Connectors/Simulation/SimulationServiceConnector.cs | 42 |
1 files changed, 3 insertions, 39 deletions
diff --git a/OpenSim/Services/Connectors/Simulation/SimulationServiceConnector.cs b/OpenSim/Services/Connectors/Simulation/SimulationServiceConnector.cs index f51c809..aca414b 100644 --- a/OpenSim/Services/Connectors/Simulation/SimulationServiceConnector.cs +++ b/OpenSim/Services/Connectors/Simulation/SimulationServiceConnector.cs | |||
@@ -271,41 +271,6 @@ namespace OpenSim.Services.Connectors.Simulation | |||
271 | return false; | 271 | return false; |
272 | } | 272 | } |
273 | 273 | ||
274 | /// <summary> | ||
275 | /// Not sure what sequence causes this function to be invoked. The only calling | ||
276 | /// path is through the GET method | ||
277 | /// </summary> | ||
278 | public bool RetrieveAgent(GridRegion destination, UUID id, out IAgentData agent) | ||
279 | { | ||
280 | // m_log.DebugFormat("[REMOTE SIMULATION CONNECTOR]: RetrieveAgent start"); | ||
281 | |||
282 | agent = null; | ||
283 | |||
284 | // Eventually, we want to use a caps url instead of the agentID | ||
285 | string uri = destination.ServerURI + AgentPath() + id + "/" + destination.RegionID.ToString() + "/"; | ||
286 | |||
287 | try | ||
288 | { | ||
289 | OSDMap result = WebUtil.GetFromService(uri, 10000); | ||
290 | if (result["Success"].AsBoolean()) | ||
291 | { | ||
292 | // OSDMap args = Util.GetOSDMap(result["_RawResult"].AsString()); | ||
293 | OSDMap args = (OSDMap)result["_Result"]; | ||
294 | if (args != null) | ||
295 | { | ||
296 | agent = new CompleteAgentData(); | ||
297 | agent.Unpack(args, null); | ||
298 | return true; | ||
299 | } | ||
300 | } | ||
301 | } | ||
302 | catch (Exception e) | ||
303 | { | ||
304 | m_log.Warn("[REMOTE SIMULATION CONNECTOR]: UpdateAgent failed with exception: " + e.ToString()); | ||
305 | } | ||
306 | |||
307 | return false; | ||
308 | } | ||
309 | 274 | ||
310 | /// <summary> | 275 | /// <summary> |
311 | /// </summary> | 276 | /// </summary> |
@@ -402,11 +367,10 @@ namespace OpenSim.Services.Connectors.Simulation | |||
402 | 367 | ||
403 | /// <summary> | 368 | /// <summary> |
404 | /// </summary> | 369 | /// </summary> |
405 | public bool CloseAgent(GridRegion destination, UUID id) | 370 | public bool CloseAgent(GridRegion destination, UUID id, string auth_code) |
406 | { | 371 | { |
407 | // m_log.DebugFormat("[REMOTE SIMULATION CONNECTOR]: CloseAgent start"); | 372 | string uri = destination.ServerURI + AgentPath() + id + "/" + destination.RegionID.ToString() + "/?auth=" + auth_code; |
408 | 373 | m_log.DebugFormat("[REMOTE SIMULATION CONNECTOR]: CloseAgent {0}", uri); | |
409 | string uri = destination.ServerURI + AgentPath() + id + "/" + destination.RegionID.ToString() + "/"; | ||
410 | 374 | ||
411 | try | 375 | try |
412 | { | 376 | { |