diff options
author | Jonathan Freedman | 2010-10-03 18:03:53 -0400 |
---|---|---|
committer | Jonathan Freedman | 2010-10-03 18:03:53 -0400 |
commit | 69acf9c79b9e83047c2a0494a6f96c7d33839d3b (patch) | |
tree | e64cff6f8ec841ffa9ee3d1bc88c85573d7b1066 /OpenSim/Services/Connectors/Simulation | |
parent | * refactor refactor refactor ServerURI 4 lyfe (diff) | |
download | opensim-SC_OLD-69acf9c79b9e83047c2a0494a6f96c7d33839d3b.zip opensim-SC_OLD-69acf9c79b9e83047c2a0494a6f96c7d33839d3b.tar.gz opensim-SC_OLD-69acf9c79b9e83047c2a0494a6f96c7d33839d3b.tar.bz2 opensim-SC_OLD-69acf9c79b9e83047c2a0494a6f96c7d33839d3b.tar.xz |
* additional serveruri cleanup
Diffstat (limited to 'OpenSim/Services/Connectors/Simulation')
-rw-r--r-- | OpenSim/Services/Connectors/Simulation/SimulationServiceConnector.cs | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/OpenSim/Services/Connectors/Simulation/SimulationServiceConnector.cs b/OpenSim/Services/Connectors/Simulation/SimulationServiceConnector.cs index 07839d3..c4284eb 100644 --- a/OpenSim/Services/Connectors/Simulation/SimulationServiceConnector.cs +++ b/OpenSim/Services/Connectors/Simulation/SimulationServiceConnector.cs | |||
@@ -72,7 +72,7 @@ namespace OpenSim.Services.Connectors.Simulation | |||
72 | 72 | ||
73 | protected virtual string AgentPath() | 73 | protected virtual string AgentPath() |
74 | { | 74 | { |
75 | return "/agent/"; | 75 | return "agent/"; |
76 | } | 76 | } |
77 | 77 | ||
78 | public bool CreateAgent(GridRegion destination, AgentCircuitData aCircuit, uint flags, out string reason) | 78 | public bool CreateAgent(GridRegion destination, AgentCircuitData aCircuit, uint flags, out string reason) |
@@ -106,8 +106,6 @@ namespace OpenSim.Services.Connectors.Simulation | |||
106 | 106 | ||
107 | string uri = destination.ServerURI + AgentPath() + aCircuit.AgentID + "/"; | 107 | string uri = destination.ServerURI + AgentPath() + aCircuit.AgentID + "/"; |
108 | 108 | ||
109 | //Console.WriteLine(" >>> DoCreateChildAgentCall <<< " + uri); | ||
110 | |||
111 | AgentCreateRequest = (HttpWebRequest)WebRequest.Create(uri); | 109 | AgentCreateRequest = (HttpWebRequest)WebRequest.Create(uri); |
112 | AgentCreateRequest.Method = "POST"; | 110 | AgentCreateRequest.Method = "POST"; |
113 | AgentCreateRequest.ContentType = "application/json"; | 111 | AgentCreateRequest.ContentType = "application/json"; |
@@ -261,7 +259,6 @@ namespace OpenSim.Services.Connectors.Simulation | |||
261 | { | 259 | { |
262 | // Eventually, we want to use a caps url instead of the agentID | 260 | // Eventually, we want to use a caps url instead of the agentID |
263 | string uri = destination.ServerURI + AgentPath() + cAgentData.AgentID + "/"; | 261 | string uri = destination.ServerURI + AgentPath() + cAgentData.AgentID + "/"; |
264 | //Console.WriteLine(" >>> DoAgentUpdateCall <<< " + uri); | ||
265 | 262 | ||
266 | HttpWebRequest ChildUpdateRequest = (HttpWebRequest)WebRequest.Create(uri); | 263 | HttpWebRequest ChildUpdateRequest = (HttpWebRequest)WebRequest.Create(uri); |
267 | ChildUpdateRequest.Method = "PUT"; | 264 | ChildUpdateRequest.Method = "PUT"; |
@@ -360,7 +357,6 @@ namespace OpenSim.Services.Connectors.Simulation | |||
360 | agent = null; | 357 | agent = null; |
361 | // Eventually, we want to use a caps url instead of the agentID | 358 | // Eventually, we want to use a caps url instead of the agentID |
362 | string uri = destination.ServerURI + AgentPath() + id + "/" + destination.RegionID.ToString() + "/"; | 359 | string uri = destination.ServerURI + AgentPath() + id + "/" + destination.RegionID.ToString() + "/"; |
363 | //Console.WriteLine(" >>> DoRetrieveRootAgentCall <<< " + uri); | ||
364 | 360 | ||
365 | HttpWebRequest request = (HttpWebRequest)WebRequest.Create(uri); | 361 | HttpWebRequest request = (HttpWebRequest)WebRequest.Create(uri); |
366 | request.Method = "GET"; | 362 | request.Method = "GET"; |
@@ -381,7 +377,6 @@ namespace OpenSim.Services.Connectors.Simulation | |||
381 | sr = new StreamReader(webResponse.GetResponseStream()); | 377 | sr = new StreamReader(webResponse.GetResponseStream()); |
382 | reply = sr.ReadToEnd().Trim(); | 378 | reply = sr.ReadToEnd().Trim(); |
383 | 379 | ||
384 | //Console.WriteLine("[REMOTE SIMULATION CONNECTOR]: ChilAgentUpdate reply was " + reply); | ||
385 | 380 | ||
386 | } | 381 | } |
387 | catch (WebException ex) | 382 | catch (WebException ex) |
@@ -402,7 +397,6 @@ namespace OpenSim.Services.Connectors.Simulation | |||
402 | OSDMap args = Util.GetOSDMap(reply); | 397 | OSDMap args = Util.GetOSDMap(reply); |
403 | if (args == null) | 398 | if (args == null) |
404 | { | 399 | { |
405 | //Console.WriteLine("[REMOTE SIMULATION CONNECTOR]: Error getting OSDMap from reply"); | ||
406 | return false; | 400 | return false; |
407 | } | 401 | } |
408 | 402 | ||
@@ -411,7 +405,6 @@ namespace OpenSim.Services.Connectors.Simulation | |||
411 | return true; | 405 | return true; |
412 | } | 406 | } |
413 | 407 | ||
414 | //Console.WriteLine("[REMOTE SIMULATION CONNECTOR]: DoRetrieveRootAgentCall returned status " + webResponse.StatusCode); | ||
415 | return false; | 408 | return false; |
416 | } | 409 | } |
417 | 410 | ||
@@ -455,7 +448,6 @@ namespace OpenSim.Services.Connectors.Simulation | |||
455 | { | 448 | { |
456 | string uri = destination.ServerURI + AgentPath() + id + "/" + destination.RegionID.ToString() + "/"; | 449 | string uri = destination.ServerURI + AgentPath() + id + "/" + destination.RegionID.ToString() + "/"; |
457 | 450 | ||
458 | //Console.WriteLine(" >>> DoCloseAgentCall <<< " + uri); | ||
459 | 451 | ||
460 | WebRequest request = WebRequest.Create(uri); | 452 | WebRequest request = WebRequest.Create(uri); |
461 | request.Method = "DELETE"; | 453 | request.Method = "DELETE"; |