diff options
| author | UbitUmarov | 2016-11-27 15:14:34 +0000 |
|---|---|---|
| committer | UbitUmarov | 2016-11-27 15:14:34 +0000 |
| commit | 877d3092b45723a2fe8b3a5bbc224cd5d5e55e82 (patch) | |
| tree | f11a5b2d85443fefc81e1958c82828a16fc656cc /OpenSim/Server/Handlers/Hypergrid/UserAgentServerConnector.cs | |
| parent | fix pool parameters for httptests (diff) | |
| parent | HG on links request build the URI in http format with a / at end, this should... (diff) | |
| download | opensim-SC-877d3092b45723a2fe8b3a5bbc224cd5d5e55e82.zip opensim-SC-877d3092b45723a2fe8b3a5bbc224cd5d5e55e82.tar.gz opensim-SC-877d3092b45723a2fe8b3a5bbc224cd5d5e55e82.tar.bz2 opensim-SC-877d3092b45723a2fe8b3a5bbc224cd5d5e55e82.tar.xz | |
Merge branch 'master' into httptests
Diffstat (limited to '')
| -rw-r--r-- | OpenSim/Server/Handlers/Hypergrid/UserAgentServerConnector.cs | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/OpenSim/Server/Handlers/Hypergrid/UserAgentServerConnector.cs b/OpenSim/Server/Handlers/Hypergrid/UserAgentServerConnector.cs index e112e0e..37feabe 100644 --- a/OpenSim/Server/Handlers/Hypergrid/UserAgentServerConnector.cs +++ b/OpenSim/Server/Handlers/Hypergrid/UserAgentServerConnector.cs | |||
| @@ -139,6 +139,7 @@ namespace OpenSim.Server.Handlers.Hypergrid | |||
| 139 | hash["region_name"] = regInfo.RegionName; | 139 | hash["region_name"] = regInfo.RegionName; |
| 140 | hash["hostname"] = regInfo.ExternalHostName; | 140 | hash["hostname"] = regInfo.ExternalHostName; |
| 141 | hash["http_port"] = regInfo.HttpPort.ToString(); | 141 | hash["http_port"] = regInfo.HttpPort.ToString(); |
| 142 | hash["server_uri"] = regInfo.ServerURI; | ||
| 142 | hash["internal_port"] = regInfo.InternalEndPoint.Port.ToString(); | 143 | hash["internal_port"] = regInfo.InternalEndPoint.Port.ToString(); |
| 143 | hash["position"] = position.ToString(); | 144 | hash["position"] = position.ToString(); |
| 144 | hash["lookAt"] = lookAt.ToString(); | 145 | hash["lookAt"] = lookAt.ToString(); |