aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/CoreModules/Communications/REST/RESTInterregionComms.cs
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim/Region/CoreModules/Communications/REST/RESTInterregionComms.cs')
-rw-r--r--OpenSim/Region/CoreModules/Communications/REST/RESTInterregionComms.cs44
1 files changed, 22 insertions, 22 deletions
diff --git a/OpenSim/Region/CoreModules/Communications/REST/RESTInterregionComms.cs b/OpenSim/Region/CoreModules/Communications/REST/RESTInterregionComms.cs
index 593d621..b19f0fa 100644
--- a/OpenSim/Region/CoreModules/Communications/REST/RESTInterregionComms.cs
+++ b/OpenSim/Region/CoreModules/Communications/REST/RESTInterregionComms.cs
@@ -273,7 +273,7 @@ namespace OpenSim.Region.CoreModules.Communications.REST
273 { 273 {
274 // Eventually, we want to use a caps url instead of the agentID 274 // Eventually, we want to use a caps url instead of the agentID
275 string uri = "http://" + region.ExternalEndPoint.Address + ":" + region.HttpPort + "/agent/" + aCircuit.AgentID + "/"; 275 string uri = "http://" + region.ExternalEndPoint.Address + ":" + region.HttpPort + "/agent/" + aCircuit.AgentID + "/";
276 //Console.WriteLine(" >>> DoCreateChildAgentCall <<< " + uri); 276 //m_log.Debug(" >>> DoCreateChildAgentCall <<< " + uri);
277 277
278 WebRequest AgentCreateRequest = WebRequest.Create(uri); 278 WebRequest AgentCreateRequest = WebRequest.Create(uri);
279 AgentCreateRequest.Method = "POST"; 279 AgentCreateRequest.Method = "POST";
@@ -358,7 +358,7 @@ namespace OpenSim.Region.CoreModules.Communications.REST
358 { 358 {
359 // Eventually, we want to use a caps url instead of the agentID 359 // Eventually, we want to use a caps url instead of the agentID
360 string uri = "http://" + region.ExternalEndPoint.Address + ":" + region.HttpPort + "/agent/" + cAgentData.AgentID + "/"; 360 string uri = "http://" + region.ExternalEndPoint.Address + ":" + region.HttpPort + "/agent/" + cAgentData.AgentID + "/";
361 //Console.WriteLine(" >>> DoChildAgentUpdateCall <<< " + uri); 361 //m_log.Debug(" >>> DoChildAgentUpdateCall <<< " + uri);
362 362
363 WebRequest ChildUpdateRequest = WebRequest.Create(uri); 363 WebRequest ChildUpdateRequest = WebRequest.Create(uri);
364 ChildUpdateRequest.Method = "PUT"; 364 ChildUpdateRequest.Method = "PUT";
@@ -440,7 +440,7 @@ namespace OpenSim.Region.CoreModules.Communications.REST
440 440
441 protected bool DoReleaseAgentCall(ulong regionHandle, UUID id, string uri) 441 protected bool DoReleaseAgentCall(ulong regionHandle, UUID id, string uri)
442 { 442 {
443 //Console.WriteLine(" >>> DoReleaseAgentCall <<< " + uri); 443 //m_log.Debug(" >>> DoReleaseAgentCall <<< " + uri);
444 444
445 WebRequest request = WebRequest.Create(uri); 445 WebRequest request = WebRequest.Create(uri);
446 request.Method = "DELETE"; 446 request.Method = "DELETE";
@@ -474,7 +474,7 @@ namespace OpenSim.Region.CoreModules.Communications.REST
474 { 474 {
475 string uri = "http://" + region.ExternalEndPoint.Address + ":" + region.HttpPort + "/agent/" + id + "/" + region.RegionHandle.ToString() +"/"; 475 string uri = "http://" + region.ExternalEndPoint.Address + ":" + region.HttpPort + "/agent/" + id + "/" + region.RegionHandle.ToString() +"/";
476 476
477 //Console.WriteLine(" >>> DoCloseAgentCall <<< " + uri); 477 //m_log.Debug(" >>> DoCloseAgentCall <<< " + uri);
478 478
479 WebRequest request = WebRequest.Create(uri); 479 WebRequest request = WebRequest.Create(uri);
480 request.Method = "DELETE"; 480 request.Method = "DELETE";
@@ -508,7 +508,7 @@ namespace OpenSim.Region.CoreModules.Communications.REST
508 { 508 {
509 ulong regionHandle = GetRegionHandle(region.RegionHandle); 509 ulong regionHandle = GetRegionHandle(region.RegionHandle);
510 string uri = "http://" + region.ExternalEndPoint.Address + ":" + region.HttpPort + "/object/" + sog.UUID + "/" + regionHandle.ToString() + "/"; 510 string uri = "http://" + region.ExternalEndPoint.Address + ":" + region.HttpPort + "/object/" + sog.UUID + "/" + regionHandle.ToString() + "/";
511 //Console.WriteLine(" >>> DoCreateChildAgentCall <<< " + uri); 511 //m_log.Debug(" >>> DoCreateChildAgentCall <<< " + uri);
512 512
513 WebRequest ObjectCreateRequest = WebRequest.Create(uri); 513 WebRequest ObjectCreateRequest = WebRequest.Create(uri);
514 ObjectCreateRequest.Method = "POST"; 514 ObjectCreateRequest.Method = "POST";
@@ -588,7 +588,7 @@ namespace OpenSim.Region.CoreModules.Communications.REST
588 protected bool DoHelloNeighbourCall(RegionInfo region, RegionInfo thisRegion) 588 protected bool DoHelloNeighbourCall(RegionInfo region, RegionInfo thisRegion)
589 { 589 {
590 string uri = "http://" + region.ExternalEndPoint.Address + ":" + region.HttpPort + "/region/" + thisRegion.RegionID + "/"; 590 string uri = "http://" + region.ExternalEndPoint.Address + ":" + region.HttpPort + "/region/" + thisRegion.RegionID + "/";
591 //Console.WriteLine(" >>> DoHelloNeighbourCall <<< " + uri); 591 //m_log.Debug(" >>> DoHelloNeighbourCall <<< " + uri);
592 592
593 WebRequest HelloNeighbourRequest = WebRequest.Create(uri); 593 WebRequest HelloNeighbourRequest = WebRequest.Create(uri);
594 HelloNeighbourRequest.Method = "POST"; 594 HelloNeighbourRequest.Method = "POST";
@@ -681,11 +681,11 @@ namespace OpenSim.Region.CoreModules.Communications.REST
681 { 681 {
682 //m_log.Debug("[CONNECTION DEBUGGING]: AgentHandler Called"); 682 //m_log.Debug("[CONNECTION DEBUGGING]: AgentHandler Called");
683 683
684 //Console.WriteLine("---------------------------"); 684 //m_log.Debug("---------------------------");
685 //Console.WriteLine(" >> uri=" + request["uri"]); 685 //m_log.Debug(" >> uri=" + request["uri"]);
686 //Console.WriteLine(" >> content-type=" + request["content-type"]); 686 //m_log.Debug(" >> content-type=" + request["content-type"]);
687 //Console.WriteLine(" >> http-method=" + request["http-method"]); 687 //m_log.Debug(" >> http-method=" + request["http-method"]);
688 //Console.WriteLine("---------------------------\n"); 688 //m_log.Debug("---------------------------\n");
689 689
690 Hashtable responsedata = new Hashtable(); 690 Hashtable responsedata = new Hashtable();
691 responsedata["content_type"] = "text/html"; 691 responsedata["content_type"] = "text/html";
@@ -833,7 +833,7 @@ namespace OpenSim.Region.CoreModules.Communications.REST
833 833
834 protected virtual void DoAgentDelete(Hashtable request, Hashtable responsedata, UUID id, string action, ulong regionHandle) 834 protected virtual void DoAgentDelete(Hashtable request, Hashtable responsedata, UUID id, string action, ulong regionHandle)
835 { 835 {
836 //Console.WriteLine(" >>> DoDelete action:" + action + "; regionHandle:" + regionHandle); 836 //m_log.Debug(" >>> DoDelete action:" + action + "; regionHandle:" + regionHandle);
837 837
838 if (action.Equals("release")) 838 if (action.Equals("release"))
839 m_localBackend.SendReleaseAgent(regionHandle, id, ""); 839 m_localBackend.SendReleaseAgent(regionHandle, id, "");
@@ -852,11 +852,11 @@ namespace OpenSim.Region.CoreModules.Communications.REST
852 { 852 {
853 //m_log.Debug("[CONNECTION DEBUGGING]: ObjectHandler Called"); 853 //m_log.Debug("[CONNECTION DEBUGGING]: ObjectHandler Called");
854 854
855 //Console.WriteLine("---------------------------"); 855 //m_log.Debug("---------------------------");
856 //Console.WriteLine(" >> uri=" + request["uri"]); 856 //m_log.Debug(" >> uri=" + request["uri"]);
857 //Console.WriteLine(" >> content-type=" + request["content-type"]); 857 //m_log.Debug(" >> content-type=" + request["content-type"]);
858 //Console.WriteLine(" >> http-method=" + request["http-method"]); 858 //m_log.Debug(" >> http-method=" + request["http-method"]);
859 //Console.WriteLine("---------------------------\n"); 859 //m_log.Debug("---------------------------\n");
860 860
861 Hashtable responsedata = new Hashtable(); 861 Hashtable responsedata = new Hashtable();
862 responsedata["content_type"] = "text/html"; 862 responsedata["content_type"] = "text/html";
@@ -964,11 +964,11 @@ namespace OpenSim.Region.CoreModules.Communications.REST
964 { 964 {
965 //m_log.Debug("[CONNECTION DEBUGGING]: RegionHandler Called"); 965 //m_log.Debug("[CONNECTION DEBUGGING]: RegionHandler Called");
966 966
967 //Console.WriteLine("---------------------------"); 967 //m_log.Debug("---------------------------");
968 //Console.WriteLine(" >> uri=" + request["uri"]); 968 //m_log.Debug(" >> uri=" + request["uri"]);
969 //Console.WriteLine(" >> content-type=" + request["content-type"]); 969 //m_log.Debug(" >> content-type=" + request["content-type"]);
970 //Console.WriteLine(" >> http-method=" + request["http-method"]); 970 //m_log.Debug(" >> http-method=" + request["http-method"]);
971 //Console.WriteLine("---------------------------\n"); 971 //m_log.Debug("---------------------------\n");
972 972
973 Hashtable responsedata = new Hashtable(); 973 Hashtable responsedata = new Hashtable();
974 responsedata["content_type"] = "text/html"; 974 responsedata["content_type"] = "text/html";