diff options
author | Justin Clark-Casey (justincc) | 2010-10-22 23:34:53 +0100 |
---|---|---|
committer | Justin Clark-Casey (justincc) | 2010-10-22 23:34:53 +0100 |
commit | 783b1b548f24b002f09cf2ceb0bdab76afed0fab (patch) | |
tree | 04313ccfa480e5d6b990d793b7240e7a013a4b56 /OpenSim/Services/Connectors/Simulation | |
parent | Revert "* more url / hg cleanup" (diff) | |
download | opensim-SC_OLD-783b1b548f24b002f09cf2ceb0bdab76afed0fab.zip opensim-SC_OLD-783b1b548f24b002f09cf2ceb0bdab76afed0fab.tar.gz opensim-SC_OLD-783b1b548f24b002f09cf2ceb0bdab76afed0fab.tar.bz2 opensim-SC_OLD-783b1b548f24b002f09cf2ceb0bdab76afed0fab.tar.xz |
Revert "* additional serveruri cleanup"
This reverts commit 19119d7705f8381a3c207d0e64a23243215a12b9.
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Services/Connectors/Simulation/SimulationServiceConnector.cs | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/OpenSim/Services/Connectors/Simulation/SimulationServiceConnector.cs b/OpenSim/Services/Connectors/Simulation/SimulationServiceConnector.cs index c4284eb..07839d3 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,6 +106,8 @@ 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 | |||
109 | AgentCreateRequest = (HttpWebRequest)WebRequest.Create(uri); | 111 | AgentCreateRequest = (HttpWebRequest)WebRequest.Create(uri); |
110 | AgentCreateRequest.Method = "POST"; | 112 | AgentCreateRequest.Method = "POST"; |
111 | AgentCreateRequest.ContentType = "application/json"; | 113 | AgentCreateRequest.ContentType = "application/json"; |
@@ -259,6 +261,7 @@ namespace OpenSim.Services.Connectors.Simulation | |||
259 | { | 261 | { |
260 | // Eventually, we want to use a caps url instead of the agentID | 262 | // Eventually, we want to use a caps url instead of the agentID |
261 | string uri = destination.ServerURI + AgentPath() + cAgentData.AgentID + "/"; | 263 | string uri = destination.ServerURI + AgentPath() + cAgentData.AgentID + "/"; |
264 | //Console.WriteLine(" >>> DoAgentUpdateCall <<< " + uri); | ||
262 | 265 | ||
263 | HttpWebRequest ChildUpdateRequest = (HttpWebRequest)WebRequest.Create(uri); | 266 | HttpWebRequest ChildUpdateRequest = (HttpWebRequest)WebRequest.Create(uri); |
264 | ChildUpdateRequest.Method = "PUT"; | 267 | ChildUpdateRequest.Method = "PUT"; |
@@ -357,6 +360,7 @@ namespace OpenSim.Services.Connectors.Simulation | |||
357 | agent = null; | 360 | agent = null; |
358 | // Eventually, we want to use a caps url instead of the agentID | 361 | // Eventually, we want to use a caps url instead of the agentID |
359 | string uri = destination.ServerURI + AgentPath() + id + "/" + destination.RegionID.ToString() + "/"; | 362 | string uri = destination.ServerURI + AgentPath() + id + "/" + destination.RegionID.ToString() + "/"; |
363 | //Console.WriteLine(" >>> DoRetrieveRootAgentCall <<< " + uri); | ||
360 | 364 | ||
361 | HttpWebRequest request = (HttpWebRequest)WebRequest.Create(uri); | 365 | HttpWebRequest request = (HttpWebRequest)WebRequest.Create(uri); |
362 | request.Method = "GET"; | 366 | request.Method = "GET"; |
@@ -377,6 +381,7 @@ namespace OpenSim.Services.Connectors.Simulation | |||
377 | sr = new StreamReader(webResponse.GetResponseStream()); | 381 | sr = new StreamReader(webResponse.GetResponseStream()); |
378 | reply = sr.ReadToEnd().Trim(); | 382 | reply = sr.ReadToEnd().Trim(); |
379 | 383 | ||
384 | //Console.WriteLine("[REMOTE SIMULATION CONNECTOR]: ChilAgentUpdate reply was " + reply); | ||
380 | 385 | ||
381 | } | 386 | } |
382 | catch (WebException ex) | 387 | catch (WebException ex) |
@@ -397,6 +402,7 @@ namespace OpenSim.Services.Connectors.Simulation | |||
397 | OSDMap args = Util.GetOSDMap(reply); | 402 | OSDMap args = Util.GetOSDMap(reply); |
398 | if (args == null) | 403 | if (args == null) |
399 | { | 404 | { |
405 | //Console.WriteLine("[REMOTE SIMULATION CONNECTOR]: Error getting OSDMap from reply"); | ||
400 | return false; | 406 | return false; |
401 | } | 407 | } |
402 | 408 | ||
@@ -405,6 +411,7 @@ namespace OpenSim.Services.Connectors.Simulation | |||
405 | return true; | 411 | return true; |
406 | } | 412 | } |
407 | 413 | ||
414 | //Console.WriteLine("[REMOTE SIMULATION CONNECTOR]: DoRetrieveRootAgentCall returned status " + webResponse.StatusCode); | ||
408 | return false; | 415 | return false; |
409 | } | 416 | } |
410 | 417 | ||
@@ -448,6 +455,7 @@ namespace OpenSim.Services.Connectors.Simulation | |||
448 | { | 455 | { |
449 | string uri = destination.ServerURI + AgentPath() + id + "/" + destination.RegionID.ToString() + "/"; | 456 | string uri = destination.ServerURI + AgentPath() + id + "/" + destination.RegionID.ToString() + "/"; |
450 | 457 | ||
458 | //Console.WriteLine(" >>> DoCloseAgentCall <<< " + uri); | ||
451 | 459 | ||
452 | WebRequest request = WebRequest.Create(uri); | 460 | WebRequest request = WebRequest.Create(uri); |
453 | request.Method = "DELETE"; | 461 | request.Method = "DELETE"; |