aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Services/GridService
diff options
context:
space:
mode:
authorJonathan Freedman2010-10-11 16:53:00 -0400
committerJonathan Freedman2010-10-11 16:53:00 -0400
commita2167b0f0dfef5f8aeb7bee99f34f672f6004bb3 (patch)
tree4e1276fe33eb861f3207d7ec3a87880e5f410f54 /OpenSim/Services/GridService
parentMerge branch 'master' of git://opensimulator.org/git/opensim (diff)
downloadopensim-SC_OLD-a2167b0f0dfef5f8aeb7bee99f34f672f6004bb3.zip
opensim-SC_OLD-a2167b0f0dfef5f8aeb7bee99f34f672f6004bb3.tar.gz
opensim-SC_OLD-a2167b0f0dfef5f8aeb7bee99f34f672f6004bb3.tar.bz2
opensim-SC_OLD-a2167b0f0dfef5f8aeb7bee99f34f672f6004bb3.tar.xz
* more url / hg cleanup
Diffstat (limited to 'OpenSim/Services/GridService')
-rw-r--r--OpenSim/Services/GridService/HypergridLinker.cs18
1 files changed, 4 insertions, 14 deletions
diff --git a/OpenSim/Services/GridService/HypergridLinker.cs b/OpenSim/Services/GridService/HypergridLinker.cs
index 11df7e0..74e864b 100644
--- a/OpenSim/Services/GridService/HypergridLinker.cs
+++ b/OpenSim/Services/GridService/HypergridLinker.cs
@@ -198,21 +198,8 @@ namespace OpenSim.Services.GridService
198 198
199 return null; 199 return null;
200 } 200 }
201
202 public bool TryCreateLink(UUID scopeID, int xloc, int yloc, string externalRegionName, string serverURI, out GridRegion regInfo, out string reason)
203 {
204 return TryCreateLink(scopeID, xloc, yloc, externalRegionName, 0, null, serverURI, out regInfo, out reason);
205 }
206
207 public bool TryCreateLink(UUID scopeID, int xloc, int yloc, string externalRegionName, uint externalPort, string externalHostName, out GridRegion regInfo, out string reason) 201 public bool TryCreateLink(UUID scopeID, int xloc, int yloc, string externalRegionName, uint externalPort, string externalHostName, out GridRegion regInfo, out string reason)
208 { 202 {
209 return TryCreateLink(scopeID, xloc, yloc, externalRegionName, externalPort, externalHostName, null, out regInfo, out reason);
210 }
211
212 // From the command line and the 2 above
213 public bool TryCreateLink(UUID scopeID, int xloc, int yloc,
214 string externalRegionName, uint externalPort, string externalHostName, string serverURI, out GridRegion regInfo, out string reason)
215 {
216 m_log.DebugFormat("[HYPERGRID LINKER]: Link to {0}:{1}:{2}, in {3}-{4}", externalHostName, externalPort, externalRegionName, xloc, yloc); 203 m_log.DebugFormat("[HYPERGRID LINKER]: Link to {0}:{1}:{2}, in {3}-{4}", externalHostName, externalPort, externalRegionName, xloc, yloc);
217 204
218 reason = string.Empty; 205 reason = string.Empty;
@@ -226,8 +213,11 @@ namespace OpenSim.Services.GridService
226 213
227 // Big HACK for Simian Grid !!! 214 // Big HACK for Simian Grid !!!
228 // We need to clean up all URLs used in OpenSim !!! 215 // We need to clean up all URLs used in OpenSim !!!
229 if (externalHostName.Contains("/")) 216 if (externalHostName.Contains("/")) {
230 regInfo.ServerURI = externalHostName; 217 regInfo.ServerURI = externalHostName;
218 } else {
219 regInfo.ServerURI = "http://" + externalHostName + ":" + externalPort.ToString();
220 }
231 221
232 try 222 try
233 { 223 {