ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-08-10 11:33:28 +08:00
Code Issues Packages Projects Releases Wiki Activity

give more use to GridInfo for gatekeeper url

Browse Source
This commit is contained in:
UbitUmarov
2020-09-23 22:21:57 +01:00
parent d0d1ab9f2a
commit 354c79168b
5 changed files with 26 additions and 89 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
OpenSim/Framework/GridInfo.cs
View File

@@ -192,6 +192,12 @@ namespace OpenSim.Framework
gatekeeper = serverConfig.GetString("ExternalName", string.Empty);
}
if (string.IsNullOrEmpty(gatekeeper))
{
IConfig gridConfig = config.Configs["GridService"];
if (gridConfig != null)
gatekeeper = gridConfig.GetString("Gatekeeper", string.Empty);
}
if (string.IsNullOrEmpty(gatekeeper))
{
if(!string.IsNullOrEmpty(defaultHost))
m_gateKeeperURL = new OSHostURL(defaultHost, true);

5
OpenSim/Framework/Util.cs
View File

@@ -475,10 +475,9 @@ namespace OpenSim.Framework
return false;
}
public static bool buildHGRegionURI(string inputName, out string serverURI, out string serverHost, out string regionName)
public static bool buildHGRegionURI(string inputName, out string serverURI, out string regionName)
{
serverURI = string.Empty;
serverHost = string.Empty;
regionName = string.Empty;
inputName = inputName.Trim();
@@ -587,10 +586,10 @@ namespace OpenSim.Framework
serverURI = serverURI.Trim(new char[] { '/', ' ' }) +":80/";
else if(uri.Port == 443)
serverURI = serverURI.Trim(new char[] { '/', ' ' }) +":443/";
serverHost = uri.Host;
return true;
}
[System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.AggressiveInlining)]
public static T Clamp<T>(T x, T min, T max)
where T : IComparable<T>
{