diff options
author | Justin Clark-Casey (justincc) | 2010-10-22 23:35:07 +0100 |
---|---|---|
committer | Justin Clark-Casey (justincc) | 2010-10-22 23:35:07 +0100 |
commit | 21187f459ea2ae590dda4249fa15ebf116d04fe0 (patch) | |
tree | 48cfec3b73bdbf54f7bc22059044b92271deedc1 /OpenSim/Server/Handlers/Hypergrid | |
parent | Revert "* refactor refactor refactor ServerURI 4 lyfe" (diff) | |
parent | Merge branch 'hg16' into mantis5110 (diff) | |
download | opensim-SC_OLD-21187f459ea2ae590dda4249fa15ebf116d04fe0.zip opensim-SC_OLD-21187f459ea2ae590dda4249fa15ebf116d04fe0.tar.gz opensim-SC_OLD-21187f459ea2ae590dda4249fa15ebf116d04fe0.tar.bz2 opensim-SC_OLD-21187f459ea2ae590dda4249fa15ebf116d04fe0.tar.xz |
Merge remote branch 'otakup0pe/mantis5110'
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Server/Handlers/Hypergrid/HomeAgentHandlers.cs | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/OpenSim/Server/Handlers/Hypergrid/HomeAgentHandlers.cs b/OpenSim/Server/Handlers/Hypergrid/HomeAgentHandlers.cs index f64a079..a5ec4f2 100644 --- a/OpenSim/Server/Handlers/Hypergrid/HomeAgentHandlers.cs +++ b/OpenSim/Server/Handlers/Hypergrid/HomeAgentHandlers.cs | |||
@@ -124,6 +124,8 @@ namespace OpenSim.Server.Handlers.Hypergrid | |||
124 | UUID uuid = UUID.Zero; | 124 | UUID uuid = UUID.Zero; |
125 | string regionname = string.Empty; | 125 | string regionname = string.Empty; |
126 | string gatekeeper_host = string.Empty; | 126 | string gatekeeper_host = string.Empty; |
127 | string gatekeeper_serveruri = string.Empty; | ||
128 | string destination_serveruri = string.Empty; | ||
127 | int gatekeeper_port = 0; | 129 | int gatekeeper_port = 0; |
128 | IPEndPoint client_ipaddress = null; | 130 | IPEndPoint client_ipaddress = null; |
129 | 131 | ||
@@ -131,8 +133,13 @@ namespace OpenSim.Server.Handlers.Hypergrid | |||
131 | gatekeeper_host = args["gatekeeper_host"].AsString(); | 133 | gatekeeper_host = args["gatekeeper_host"].AsString(); |
132 | if (args.ContainsKey("gatekeeper_port") && args["gatekeeper_port"] != null) | 134 | if (args.ContainsKey("gatekeeper_port") && args["gatekeeper_port"] != null) |
133 | Int32.TryParse(args["gatekeeper_port"].AsString(), out gatekeeper_port); | 135 | Int32.TryParse(args["gatekeeper_port"].AsString(), out gatekeeper_port); |
136 | if (args.ContainsKey("gatekeeper_serveruri") && args["gatekeeper_serveruri"] !=null) | ||
137 | gatekeeper_serveruri = args["gatekeeper_serveruri"]; | ||
138 | if (args.ContainsKey("destination_serveruri") && args["destination_serveruri"] !=null) | ||
139 | destination_serveruri = args["destination_serveruri"]; | ||
134 | 140 | ||
135 | GridRegion gatekeeper = new GridRegion(); | 141 | GridRegion gatekeeper = new GridRegion(); |
142 | gatekeeper.ServerURI = gatekeeper_serveruri; | ||
136 | gatekeeper.ExternalHostName = gatekeeper_host; | 143 | gatekeeper.ExternalHostName = gatekeeper_host; |
137 | gatekeeper.HttpPort = (uint)gatekeeper_port; | 144 | gatekeeper.HttpPort = (uint)gatekeeper_port; |
138 | gatekeeper.InternalEndPoint = new IPEndPoint(IPAddress.Parse("0.0.0.0"), 0); | 145 | gatekeeper.InternalEndPoint = new IPEndPoint(IPAddress.Parse("0.0.0.0"), 0); |
@@ -173,7 +180,8 @@ namespace OpenSim.Server.Handlers.Hypergrid | |||
173 | destination.RegionLocX = x; | 180 | destination.RegionLocX = x; |
174 | destination.RegionLocY = y; | 181 | destination.RegionLocY = y; |
175 | destination.RegionName = regionname; | 182 | destination.RegionName = regionname; |
176 | 183 | destination.ServerURI = destination_serveruri; | |
184 | |||
177 | AgentCircuitData aCircuit = new AgentCircuitData(); | 185 | AgentCircuitData aCircuit = new AgentCircuitData(); |
178 | try | 186 | try |
179 | { | 187 | { |