From 19119d7705f8381a3c207d0e64a23243215a12b9 Mon Sep 17 00:00:00 2001
From: Jonathan Freedman
Date: Sun, 3 Oct 2010 18:03:53 -0400
Subject: * additional serveruri cleanup

---
 .../Connectors/Hypergrid/GatekeeperServiceConnector.cs     | 14 ++++++--------
 .../Connectors/Simulation/SimulationServiceConnector.cs    | 10 +---------
 2 files changed, 7 insertions(+), 17 deletions(-)

(limited to 'OpenSim/Services/Connectors')

diff --git a/OpenSim/Services/Connectors/Hypergrid/GatekeeperServiceConnector.cs b/OpenSim/Services/Connectors/Hypergrid/GatekeeperServiceConnector.cs
index 89a8f7a..2b19b87 100644
--- a/OpenSim/Services/Connectors/Hypergrid/GatekeeperServiceConnector.cs
+++ b/OpenSim/Services/Connectors/Hypergrid/GatekeeperServiceConnector.cs
@@ -63,12 +63,12 @@ namespace OpenSim.Services.Connectors.Hypergrid
 
         protected override string AgentPath()
         {
-            return "/foreignagent/";
+            return "foreignagent/";
         }
 
         protected override string ObjectPath()
         {
-            return "/foreignobject/";
+            return "foreignobject/";
         }
 
         public bool LinkRegion(GridRegion info, out UUID regionID, out ulong realHandle, out string externalName, out string imageURL, out string reason)
@@ -86,12 +86,11 @@ namespace OpenSim.Services.Connectors.Hypergrid
             paramList.Add(hash);
 
             XmlRpcRequest request = new XmlRpcRequest("link_region", paramList);
-            string uri = "http://" + ((info.ServerURI != null && info.ServerURI != string.Empty && !info.ServerURI.StartsWith("http:")) ? info.ServerURI : info.ExternalEndPoint.Address + ":" + info.HttpPort + "/");
-            m_log.Debug("[GATEKEEPER SERVICE CONNECTOR]: Linking to " + uri);
+            m_log.Debug("[GATEKEEPER SERVICE CONNECTOR]: Linking to " + info.ServerURI);
             XmlRpcResponse response = null;
             try
             {
-                response = request.Send(uri, 10000);
+                response = request.Send(info.ServerURI, 10000);
             }
             catch (Exception e)
             {
@@ -192,12 +191,11 @@ namespace OpenSim.Services.Connectors.Hypergrid
             paramList.Add(hash);
 
             XmlRpcRequest request = new XmlRpcRequest("get_region", paramList);
-            string uri = "http://" + ((gatekeeper.ServerURI != null && gatekeeper.ServerURI != string.Empty && !gatekeeper.ServerURI.StartsWith("http:")) ? gatekeeper.ServerURI : gatekeeper.ExternalEndPoint.Address + ":" + gatekeeper.HttpPort + "/");
-            m_log.Debug("[GATEKEEPER SERVICE CONNECTOR]: contacting " + uri);
+            m_log.Debug("[GATEKEEPER SERVICE CONNECTOR]: contacting " + gatekeeper.ServerURI);
             XmlRpcResponse response = null;
             try
             {
-                response = request.Send(uri, 10000);
+                response = request.Send(gatekeeper.ServerURI, 10000);
             }
             catch (Exception e)
             {
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
 
         protected virtual string AgentPath()
         {
-            return "/agent/";
+            return "agent/";
         }
 
         public bool CreateAgent(GridRegion destination, AgentCircuitData aCircuit, uint flags, out string reason)
@@ -106,8 +106,6 @@ namespace OpenSim.Services.Connectors.Simulation
 
             string uri = destination.ServerURI + AgentPath() + aCircuit.AgentID + "/";
 
-            //Console.WriteLine("   >>> DoCreateChildAgentCall <<< " + uri);
-
             AgentCreateRequest = (HttpWebRequest)WebRequest.Create(uri);
             AgentCreateRequest.Method = "POST";
             AgentCreateRequest.ContentType = "application/json";
@@ -261,7 +259,6 @@ namespace OpenSim.Services.Connectors.Simulation
         {
             // Eventually, we want to use a caps url instead of the agentID
             string uri = destination.ServerURI + AgentPath() + cAgentData.AgentID + "/";
-            //Console.WriteLine("   >>> DoAgentUpdateCall <<< " + uri);
 
             HttpWebRequest ChildUpdateRequest = (HttpWebRequest)WebRequest.Create(uri);
             ChildUpdateRequest.Method = "PUT";
@@ -360,7 +357,6 @@ namespace OpenSim.Services.Connectors.Simulation
             agent = null;
             // Eventually, we want to use a caps url instead of the agentID
             string uri = destination.ServerURI + AgentPath() + id + "/" + destination.RegionID.ToString() + "/";
-            //Console.WriteLine("   >>> DoRetrieveRootAgentCall <<< " + uri);
 
             HttpWebRequest request = (HttpWebRequest)WebRequest.Create(uri);
             request.Method = "GET";
@@ -381,7 +377,6 @@ namespace OpenSim.Services.Connectors.Simulation
                 sr = new StreamReader(webResponse.GetResponseStream());
                 reply = sr.ReadToEnd().Trim();
 
-                //Console.WriteLine("[REMOTE SIMULATION CONNECTOR]: ChilAgentUpdate reply was " + reply);
 
             }
             catch (WebException ex)
@@ -402,7 +397,6 @@ namespace OpenSim.Services.Connectors.Simulation
                 OSDMap args = Util.GetOSDMap(reply);
                 if (args == null)
                 {
-                    //Console.WriteLine("[REMOTE SIMULATION CONNECTOR]: Error getting OSDMap from reply");
                     return false;
                 }
 
@@ -411,7 +405,6 @@ namespace OpenSim.Services.Connectors.Simulation
                 return true;
             }
 
-            //Console.WriteLine("[REMOTE SIMULATION CONNECTOR]: DoRetrieveRootAgentCall returned status " + webResponse.StatusCode);
             return false;
         }
 
@@ -455,7 +448,6 @@ namespace OpenSim.Services.Connectors.Simulation
         {
             string uri = destination.ServerURI + AgentPath() + id + "/" + destination.RegionID.ToString() + "/";
 
-            //Console.WriteLine("   >>> DoCloseAgentCall <<< " + uri);
 
             WebRequest request = WebRequest.Create(uri);
             request.Method = "DELETE";
-- 
cgit v1.1