Merge branch 'master' into httptests

2026-08-12 12:25:42 +08:00 · 2016-12-14 13:35:53 +00:00
parent 8114ff9d06 50842347ac
commit 18a292ad02
33 changed files with 231 additions and 111 deletions
--- a/OpenSim/Server/Handlers/Hypergrid/HypergridHandlers.cs
+++ b/OpenSim/Server/Handlers/Hypergrid/HypergridHandlers.cs
@@ -125,6 +125,7 @@ namespace OpenSim.Server.Handlers.Hypergrid
                hash["hostname"] = regInfo.ExternalHostName;
                hash["http_port"] = regInfo.HttpPort.ToString();
                hash["internal_port"] = regInfo.InternalEndPoint.Port.ToString();
+                hash["server_uri"] = regInfo.ServerURI;
            }

            if (message != null)