aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Services/Connectors/Hypergrid
diff options
context:
space:
mode:
authorJonathan Freedman2010-10-03 18:03:53 -0400
committerJonathan Freedman2010-10-03 18:03:53 -0400
commit69acf9c79b9e83047c2a0494a6f96c7d33839d3b (patch)
treee64cff6f8ec841ffa9ee3d1bc88c85573d7b1066 /OpenSim/Services/Connectors/Hypergrid
parent* refactor refactor refactor ServerURI 4 lyfe (diff)
downloadopensim-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/Hypergrid')
-rw-r--r--OpenSim/Services/Connectors/Hypergrid/GatekeeperServiceConnector.cs14
1 files changed, 6 insertions, 8 deletions
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
63 63
64 protected override string AgentPath() 64 protected override string AgentPath()
65 { 65 {
66 return "/foreignagent/"; 66 return "foreignagent/";
67 } 67 }
68 68
69 protected override string ObjectPath() 69 protected override string ObjectPath()
70 { 70 {
71 return "/foreignobject/"; 71 return "foreignobject/";
72 } 72 }
73 73
74 public bool LinkRegion(GridRegion info, out UUID regionID, out ulong realHandle, out string externalName, out string imageURL, out string reason) 74 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
86 paramList.Add(hash); 86 paramList.Add(hash);
87 87
88 XmlRpcRequest request = new XmlRpcRequest("link_region", paramList); 88 XmlRpcRequest request = new XmlRpcRequest("link_region", paramList);
89 string uri = "http://" + ((info.ServerURI != null && info.ServerURI != string.Empty && !info.ServerURI.StartsWith("http:")) ? info.ServerURI : info.ExternalEndPoint.Address + ":" + info.HttpPort + "/"); 89 m_log.Debug("[GATEKEEPER SERVICE CONNECTOR]: Linking to " + info.ServerURI);
90 m_log.Debug("[GATEKEEPER SERVICE CONNECTOR]: Linking to " + uri);
91 XmlRpcResponse response = null; 90 XmlRpcResponse response = null;
92 try 91 try
93 { 92 {
94 response = request.Send(uri, 10000); 93 response = request.Send(info.ServerURI, 10000);
95 } 94 }
96 catch (Exception e) 95 catch (Exception e)
97 { 96 {
@@ -192,12 +191,11 @@ namespace OpenSim.Services.Connectors.Hypergrid
192 paramList.Add(hash); 191 paramList.Add(hash);
193 192
194 XmlRpcRequest request = new XmlRpcRequest("get_region", paramList); 193 XmlRpcRequest request = new XmlRpcRequest("get_region", paramList);
195 string uri = "http://" + ((gatekeeper.ServerURI != null && gatekeeper.ServerURI != string.Empty && !gatekeeper.ServerURI.StartsWith("http:")) ? gatekeeper.ServerURI : gatekeeper.ExternalEndPoint.Address + ":" + gatekeeper.HttpPort + "/"); 194 m_log.Debug("[GATEKEEPER SERVICE CONNECTOR]: contacting " + gatekeeper.ServerURI);
196 m_log.Debug("[GATEKEEPER SERVICE CONNECTOR]: contacting " + uri);
197 XmlRpcResponse response = null; 195 XmlRpcResponse response = null;
198 try 196 try
199 { 197 {
200 response = request.Send(uri, 10000); 198 response = request.Send(gatekeeper.ServerURI, 10000);
201 } 199 }
202 catch (Exception e) 200 catch (Exception e)
203 { 201 {