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/Services/Connectors/Hypergrid/UserAgentServiceConnector.cs | |
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/Services/Connectors/Hypergrid/UserAgentServiceConnector.cs | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/OpenSim/Services/Connectors/Hypergrid/UserAgentServiceConnector.cs b/OpenSim/Services/Connectors/Hypergrid/UserAgentServiceConnector.cs index 247dd7e..0c41935 100644 --- a/OpenSim/Services/Connectors/Hypergrid/UserAgentServiceConnector.cs +++ b/OpenSim/Services/Connectors/Hypergrid/UserAgentServiceConnector.cs | |||
@@ -232,12 +232,14 @@ 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); | ||
235 | args["gatekeeper_host"] = OSD.FromString(gatekeeper.ExternalHostName); | 236 | args["gatekeeper_host"] = OSD.FromString(gatekeeper.ExternalHostName); |
236 | args["gatekeeper_port"] = OSD.FromString(gatekeeper.HttpPort.ToString()); | 237 | args["gatekeeper_port"] = OSD.FromString(gatekeeper.HttpPort.ToString()); |
237 | args["destination_x"] = OSD.FromString(destination.RegionLocX.ToString()); | 238 | args["destination_x"] = OSD.FromString(destination.RegionLocX.ToString()); |
238 | args["destination_y"] = OSD.FromString(destination.RegionLocY.ToString()); | 239 | args["destination_y"] = OSD.FromString(destination.RegionLocY.ToString()); |
239 | args["destination_name"] = OSD.FromString(destination.RegionName); | 240 | args["destination_name"] = OSD.FromString(destination.RegionName); |
240 | args["destination_uuid"] = OSD.FromString(destination.RegionID.ToString()); | 241 | args["destination_uuid"] = OSD.FromString(destination.RegionID.ToString()); |
242 | args["destination_serveruri"] = OSD.FromString(destination.ServerURI); | ||
241 | 243 | ||
242 | // 10/3/2010 | 244 | // 10/3/2010 |
243 | // I added the client_ip up to the regular AgentCircuitData, so this doesn't need to be here. | 245 | // I added the client_ip up to the regular AgentCircuitData, so this doesn't need to be here. |