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/Services/Connectors/Hypergrid/UserAgentServiceConnector.cs | |
parent | Merge remote branch 'otakup0pe/mantis5110' (diff) | |
download | opensim-SC-fe8d3d5a2bc0ddbc051d8a7ad2412da5f3546075.zip opensim-SC-fe8d3d5a2bc0ddbc051d8a7ad2412da5f3546075.tar.gz opensim-SC-fe8d3d5a2bc0ddbc051d8a7ad2412da5f3546075.tar.bz2 opensim-SC-fe8d3d5a2bc0ddbc051d8a7ad2412da5f3546075.tar.xz |
Revert "Merge remote branch 'otakup0pe/mantis5110'"
This reverts commit 21187f459ea2ae590dda4249fa15ebf116d04fe0, reversing
changes made to 8f34e46d7449be1c29419a232a8f7f1e5918f03c.
Diffstat (limited to 'OpenSim/Services/Connectors/Hypergrid/UserAgentServiceConnector.cs')
-rw-r--r-- | OpenSim/Services/Connectors/Hypergrid/UserAgentServiceConnector.cs | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/OpenSim/Services/Connectors/Hypergrid/UserAgentServiceConnector.cs b/OpenSim/Services/Connectors/Hypergrid/UserAgentServiceConnector.cs index 0c41935..247dd7e 100644 --- a/OpenSim/Services/Connectors/Hypergrid/UserAgentServiceConnector.cs +++ b/OpenSim/Services/Connectors/Hypergrid/UserAgentServiceConnector.cs | |||
@@ -232,14 +232,12 @@ namespace OpenSim.Services.Connectors.Hypergrid | |||
232 | m_log.Debug("[USER AGENT CONNECTOR]: PackAgentCircuitData failed with exception: " + e.Message); | 232 | m_log.Debug("[USER AGENT CONNECTOR]: PackAgentCircuitData failed with exception: " + e.Message); |
233 | } | 233 | } |
234 | // Add the input arguments | 234 | // Add the input arguments |
235 | args["gatekeeper_serveruri"] = OSD.FromString(gatekeeper.ServerURI); | ||
236 | args["gatekeeper_host"] = OSD.FromString(gatekeeper.ExternalHostName); | 235 | args["gatekeeper_host"] = OSD.FromString(gatekeeper.ExternalHostName); |
237 | args["gatekeeper_port"] = OSD.FromString(gatekeeper.HttpPort.ToString()); | 236 | args["gatekeeper_port"] = OSD.FromString(gatekeeper.HttpPort.ToString()); |
238 | args["destination_x"] = OSD.FromString(destination.RegionLocX.ToString()); | 237 | args["destination_x"] = OSD.FromString(destination.RegionLocX.ToString()); |
239 | args["destination_y"] = OSD.FromString(destination.RegionLocY.ToString()); | 238 | args["destination_y"] = OSD.FromString(destination.RegionLocY.ToString()); |
240 | args["destination_name"] = OSD.FromString(destination.RegionName); | 239 | args["destination_name"] = OSD.FromString(destination.RegionName); |
241 | args["destination_uuid"] = OSD.FromString(destination.RegionID.ToString()); | 240 | args["destination_uuid"] = OSD.FromString(destination.RegionID.ToString()); |
242 | args["destination_serveruri"] = OSD.FromString(destination.ServerURI); | ||
243 | 241 | ||
244 | // 10/3/2010 | 242 | // 10/3/2010 |
245 | // I added the client_ip up to the regular AgentCircuitData, so this doesn't need to be here. | 243 | // I added the client_ip up to the regular AgentCircuitData, so this doesn't need to be here. |