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