diff options
author | Justin Clark-Casey (justincc) | 2010-10-22 23:34:44 +0100 |
---|---|---|
committer | Justin Clark-Casey (justincc) | 2010-10-22 23:34:44 +0100 |
commit | a490b34b6e584119312bd1b9ee8c30c4b9f02c62 (patch) | |
tree | db3125aa52414dc0cf9a441027034667bc5e9635 /OpenSim/Services/GridService | |
parent | Revert "* remove some spurious debug info" (diff) | |
download | opensim-SC_OLD-a490b34b6e584119312bd1b9ee8c30c4b9f02c62.zip opensim-SC_OLD-a490b34b6e584119312bd1b9ee8c30c4b9f02c62.tar.gz opensim-SC_OLD-a490b34b6e584119312bd1b9ee8c30c4b9f02c62.tar.bz2 opensim-SC_OLD-a490b34b6e584119312bd1b9ee8c30c4b9f02c62.tar.xz |
Revert "* more url / hg cleanup"
This reverts commit 58f75fa19d9aea18283ecdbd44559efb81781c9d.
Diffstat (limited to 'OpenSim/Services/GridService')
-rw-r--r-- | OpenSim/Services/GridService/HypergridLinker.cs | 18 |
1 files changed, 14 insertions, 4 deletions
diff --git a/OpenSim/Services/GridService/HypergridLinker.cs b/OpenSim/Services/GridService/HypergridLinker.cs index 74e864b..11df7e0 100644 --- a/OpenSim/Services/GridService/HypergridLinker.cs +++ b/OpenSim/Services/GridService/HypergridLinker.cs | |||
@@ -198,8 +198,21 @@ 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 | |||
201 | public bool TryCreateLink(UUID scopeID, int xloc, int yloc, string externalRegionName, uint externalPort, string externalHostName, out GridRegion regInfo, out string reason) | 207 | public bool TryCreateLink(UUID scopeID, int xloc, int yloc, string externalRegionName, uint externalPort, string externalHostName, out GridRegion regInfo, out string reason) |
202 | { | 208 | { |
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 | { | ||
203 | m_log.DebugFormat("[HYPERGRID LINKER]: Link to {0}:{1}:{2}, in {3}-{4}", externalHostName, externalPort, externalRegionName, xloc, yloc); | 216 | m_log.DebugFormat("[HYPERGRID LINKER]: Link to {0}:{1}:{2}, in {3}-{4}", externalHostName, externalPort, externalRegionName, xloc, yloc); |
204 | 217 | ||
205 | reason = string.Empty; | 218 | reason = string.Empty; |
@@ -213,11 +226,8 @@ namespace OpenSim.Services.GridService | |||
213 | 226 | ||
214 | // Big HACK for Simian Grid !!! | 227 | // Big HACK for Simian Grid !!! |
215 | // We need to clean up all URLs used in OpenSim !!! | 228 | // We need to clean up all URLs used in OpenSim !!! |
216 | if (externalHostName.Contains("/")) { | 229 | if (externalHostName.Contains("/")) |
217 | regInfo.ServerURI = externalHostName; | 230 | regInfo.ServerURI = externalHostName; |
218 | } else { | ||
219 | regInfo.ServerURI = "http://" + externalHostName + ":" + externalPort.ToString(); | ||
220 | } | ||
221 | 231 | ||
222 | try | 232 | try |
223 | { | 233 | { |