diff options
author | Justin Clark-Casey (justincc) | 2010-10-22 23:34:53 +0100 |
---|---|---|
committer | Justin Clark-Casey (justincc) | 2010-10-22 23:34:53 +0100 |
commit | 783b1b548f24b002f09cf2ceb0bdab76afed0fab (patch) | |
tree | 04313ccfa480e5d6b990d793b7240e7a013a4b56 /OpenSim/Services/GridService/HypergridLinker.cs | |
parent | Revert "* more url / hg cleanup" (diff) | |
download | opensim-SC-783b1b548f24b002f09cf2ceb0bdab76afed0fab.zip opensim-SC-783b1b548f24b002f09cf2ceb0bdab76afed0fab.tar.gz opensim-SC-783b1b548f24b002f09cf2ceb0bdab76afed0fab.tar.bz2 opensim-SC-783b1b548f24b002f09cf2ceb0bdab76afed0fab.tar.xz |
Revert "* additional serveruri cleanup"
This reverts commit 19119d7705f8381a3c207d0e64a23243215a12b9.
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Services/GridService/HypergridLinker.cs | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/OpenSim/Services/GridService/HypergridLinker.cs b/OpenSim/Services/GridService/HypergridLinker.cs index 11df7e0..757ae80 100644 --- a/OpenSim/Services/GridService/HypergridLinker.cs +++ b/OpenSim/Services/GridService/HypergridLinker.cs | |||
@@ -199,14 +199,11 @@ namespace OpenSim.Services.GridService | |||
199 | return null; | 199 | return null; |
200 | } | 200 | } |
201 | 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 | 202 | ||
207 | public bool TryCreateLink(UUID scopeID, int xloc, int yloc, string externalRegionName, uint externalPort, string externalHostName, out GridRegion regInfo, out string reason) | 203 | public bool TryCreateLink(UUID scopeID, int xloc, int yloc, |
204 | string externalRegionName, uint externalPort, string externalHostName, out GridRegion regInfo, out string reason) | ||
208 | { | 205 | { |
209 | return TryCreateLink(scopeID, xloc, yloc, externalRegionName, externalPort, externalHostName, null, out regInfo, out reason); | 206 | TryCreateLink(scopeID, xloc, yloc, externalRegionName, externalPort, externalHostName, null, regInfo, reason); |
210 | } | 207 | } |
211 | 208 | ||
212 | // From the command line and the 2 above | 209 | // From the command line and the 2 above |