diff options
author | Jonathan Freedman | 2010-10-02 19:17:02 -0400 |
---|---|---|
committer | Jonathan Freedman | 2010-10-02 19:17:02 -0400 |
commit | 32ccc7a9d912543c0a5d3f8db839734194f3d8dd (patch) | |
tree | 9822d8a2ea479b4a8d26ae7cc4df0124db201c56 /OpenSim/Services/GridService | |
parent | So, the client can have an old idea of the object properties for the object w... (diff) | |
download | opensim-SC_OLD-32ccc7a9d912543c0a5d3f8db839734194f3d8dd.zip opensim-SC_OLD-32ccc7a9d912543c0a5d3f8db839734194f3d8dd.tar.gz opensim-SC_OLD-32ccc7a9d912543c0a5d3f8db839734194f3d8dd.tar.bz2 opensim-SC_OLD-32ccc7a9d912543c0a5d3f8db839734194f3d8dd.tar.xz |
* refactor refactor refactor ServerURI 4 lyfe
Diffstat (limited to 'OpenSim/Services/GridService')
-rw-r--r-- | OpenSim/Services/GridService/HypergridLinker.cs | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/OpenSim/Services/GridService/HypergridLinker.cs b/OpenSim/Services/GridService/HypergridLinker.cs index b86fb6f..757ae80 100644 --- a/OpenSim/Services/GridService/HypergridLinker.cs +++ b/OpenSim/Services/GridService/HypergridLinker.cs | |||
@@ -127,7 +127,7 @@ namespace OpenSim.Services.GridService | |||
127 | if (MainConsole.Instance != null) | 127 | if (MainConsole.Instance != null) |
128 | { | 128 | { |
129 | MainConsole.Instance.Commands.AddCommand("hypergrid", false, "link-region", | 129 | MainConsole.Instance.Commands.AddCommand("hypergrid", false, "link-region", |
130 | "link-region <Xloc> <Yloc> <HostName>:<HttpPort>[:<RemoteRegionName>] <cr>", | 130 | "link-region <Xloc> <Yloc> <RegionIP> <RegionPort> [<RegionServerURI] [<RemoteRegionName>] <cr>", |
131 | "Link a hypergrid region", RunCommand); | 131 | "Link a hypergrid region", RunCommand); |
132 | MainConsole.Instance.Commands.AddCommand("hypergrid", false, "unlink-region", | 132 | MainConsole.Instance.Commands.AddCommand("hypergrid", false, "unlink-region", |
133 | "unlink-region <local name> or <HostName>:<HttpPort> <cr>", | 133 | "unlink-region <local name> or <HostName>:<HttpPort> <cr>", |
@@ -200,10 +200,16 @@ namespace OpenSim.Services.GridService | |||
200 | } | 200 | } |
201 | 201 | ||
202 | 202 | ||
203 | // From the command line and the 2 above | ||
204 | public bool TryCreateLink(UUID scopeID, int xloc, int yloc, | 203 | public bool TryCreateLink(UUID scopeID, int xloc, int yloc, |
205 | 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) |
206 | { | 205 | { |
206 | TryCreateLink(scopeID, xloc, yloc, externalRegionName, externalPort, externalHostName, null, regInfo, reason); | ||
207 | } | ||
208 | |||
209 | // From the command line and the 2 above | ||
210 | public bool TryCreateLink(UUID scopeID, int xloc, int yloc, | ||
211 | string externalRegionName, uint externalPort, string externalHostName, string serverURI, out GridRegion regInfo, out string reason) | ||
212 | { | ||
207 | m_log.DebugFormat("[HYPERGRID LINKER]: Link to {0}:{1}:{2}, in {3}-{4}", externalHostName, externalPort, externalRegionName, xloc, yloc); | 213 | m_log.DebugFormat("[HYPERGRID LINKER]: Link to {0}:{1}:{2}, in {3}-{4}", externalHostName, externalPort, externalRegionName, xloc, yloc); |
208 | 214 | ||
209 | reason = string.Empty; | 215 | reason = string.Empty; |
@@ -509,12 +515,16 @@ namespace OpenSim.Services.GridService | |||
509 | int xloc, yloc; | 515 | int xloc, yloc; |
510 | uint externalPort; | 516 | uint externalPort; |
511 | string externalHostName; | 517 | string externalHostName; |
518 | string serverURI; | ||
512 | try | 519 | try |
513 | { | 520 | { |
514 | xloc = Convert.ToInt32(cmdparams[0]); | 521 | xloc = Convert.ToInt32(cmdparams[0]); |
515 | yloc = Convert.ToInt32(cmdparams[1]); | 522 | yloc = Convert.ToInt32(cmdparams[1]); |
516 | externalPort = Convert.ToUInt32(cmdparams[3]); | 523 | externalPort = Convert.ToUInt32(cmdparams[3]); |
517 | externalHostName = cmdparams[2]; | 524 | externalHostName = cmdparams[2]; |
525 | if ( cmdparams.Length == 4 ) { | ||
526 | |||
527 | } | ||
518 | //internalPort = Convert.ToUInt32(cmdparams[4]); | 528 | //internalPort = Convert.ToUInt32(cmdparams[4]); |
519 | //remotingPort = Convert.ToUInt32(cmdparams[5]); | 529 | //remotingPort = Convert.ToUInt32(cmdparams[5]); |
520 | } | 530 | } |