diff options
author | Jonathan Freedman | 2010-10-03 18:03:53 -0400 |
---|---|---|
committer | Jonathan Freedman | 2010-10-03 18:03:53 -0400 |
commit | 69acf9c79b9e83047c2a0494a6f96c7d33839d3b (patch) | |
tree | e64cff6f8ec841ffa9ee3d1bc88c85573d7b1066 /OpenSim/Services/GridService/HypergridLinker.cs | |
parent | * refactor refactor refactor ServerURI 4 lyfe (diff) | |
download | opensim-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/GridService/HypergridLinker.cs')
-rw-r--r-- | OpenSim/Services/GridService/HypergridLinker.cs | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/OpenSim/Services/GridService/HypergridLinker.cs b/OpenSim/Services/GridService/HypergridLinker.cs index 757ae80..11df7e0 100644 --- a/OpenSim/Services/GridService/HypergridLinker.cs +++ b/OpenSim/Services/GridService/HypergridLinker.cs | |||
@@ -199,11 +199,14 @@ 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 | } | ||
202 | 206 | ||
203 | public bool TryCreateLink(UUID scopeID, int xloc, int yloc, | 207 | public bool TryCreateLink(UUID scopeID, int xloc, int yloc, string externalRegionName, uint externalPort, string externalHostName, out GridRegion regInfo, out string reason) |
204 | string externalRegionName, uint externalPort, string externalHostName, out GridRegion regInfo, out string reason) | ||
205 | { | 208 | { |
206 | TryCreateLink(scopeID, xloc, yloc, externalRegionName, externalPort, externalHostName, null, regInfo, reason); | 209 | return TryCreateLink(scopeID, xloc, yloc, externalRegionName, externalPort, externalHostName, null, out regInfo, out reason); |
207 | } | 210 | } |
208 | 211 | ||
209 | // From the command line and the 2 above | 212 | // From the command line and the 2 above |