diff options
| author | UbitUmarov | 2016-12-14 13:35:53 +0000 |
|---|---|---|
| committer | UbitUmarov | 2016-12-14 13:35:53 +0000 |
| commit | 18a292ad02e590619760a71aeb1514e6916b257f (patch) | |
| tree | 584faa43265cc20ee36d92b2bc14cb1c55435ef0 /OpenSim/Server | |
| parent | Merge branch 'master' into httptests (diff) | |
| parent | fix: check for region_handle before region_id, viewers are so funny.. (diff) | |
| download | opensim-SC-18a292ad02e590619760a71aeb1514e6916b257f.zip opensim-SC-18a292ad02e590619760a71aeb1514e6916b257f.tar.gz opensim-SC-18a292ad02e590619760a71aeb1514e6916b257f.tar.bz2 opensim-SC-18a292ad02e590619760a71aeb1514e6916b257f.tar.xz | |
Merge branch 'master' into httptests
Diffstat (limited to 'OpenSim/Server')
| -rw-r--r-- | OpenSim/Server/Handlers/Hypergrid/HypergridHandlers.cs | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/OpenSim/Server/Handlers/Hypergrid/HypergridHandlers.cs b/OpenSim/Server/Handlers/Hypergrid/HypergridHandlers.cs index 2d0b2b6..6bd24db 100644 --- a/OpenSim/Server/Handlers/Hypergrid/HypergridHandlers.cs +++ b/OpenSim/Server/Handlers/Hypergrid/HypergridHandlers.cs | |||
| @@ -125,6 +125,7 @@ namespace OpenSim.Server.Handlers.Hypergrid | |||
| 125 | hash["hostname"] = regInfo.ExternalHostName; | 125 | hash["hostname"] = regInfo.ExternalHostName; |
| 126 | hash["http_port"] = regInfo.HttpPort.ToString(); | 126 | hash["http_port"] = regInfo.HttpPort.ToString(); |
| 127 | hash["internal_port"] = regInfo.InternalEndPoint.Port.ToString(); | 127 | hash["internal_port"] = regInfo.InternalEndPoint.Port.ToString(); |
| 128 | hash["server_uri"] = regInfo.ServerURI; | ||
| 128 | } | 129 | } |
| 129 | 130 | ||
| 130 | if (message != null) | 131 | if (message != null) |