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

gridinfo and ossl

Browse Source
This commit is contained in:
UbitUmarov
2020-09-26 14:25:36 +01:00
parent 6b97367ed0
commit e6d14ad303
3 changed files with 23 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
OpenSim/Framework/GridInfo.cs
View File

@@ -331,6 +331,26 @@ namespace OpenSim.Framework
}
}
public string HGHomeURL
{
get
{
if (m_homeURL.URLType != UriHostNameType.Unknown && m_hasHGconfig)
return m_homeURL.URL;
return null;
}
}
public string HGHomeURLNoEndSlash
{
get
{
if (m_homeURL.URLType != UriHostNameType.Unknown && m_hasHGconfig)
return m_homeURL.URL.Substring(0, m_gateKeeperURL.URL.Length - 1);
return null;
}
}
// -2 dns failed
// -1 if bad url
// 0 if not local

2
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
View File

@@ -784,7 +784,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
public LSL_Float llSin(double f)
{
m_host.AddScriptLPS(1);
return (double)Math.Sin(f);
return Math.Sin(f);
}
public LSL_Float llCos(double f)

29
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs
View File

@@ -2667,39 +2667,14 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
{
CheckThreatLevel(ThreatLevel.Moderate, "osGetGridHomeURI");
IConfigSource config = m_ScriptEngine.ConfigSource;
string HomeURI = Util.GetConfigVarFromSections<string>(config, "HomeURI",
new string[] { "Startup", "Hypergrid" }, String.Empty);
if (!string.IsNullOrEmpty(HomeURI))
return HomeURI;
// Legacy. Remove soon!
if (config.Configs["LoginService"] != null)
HomeURI = config.Configs["LoginService"].GetString("SRV_HomeURI", HomeURI);
if (String.IsNullOrEmpty(HomeURI))
HomeURI = GridUserInfo(InfoType.Home);
return HomeURI;
return World.SceneGridInfo.HGHomeURLNoEndSlash;
}
public string osGetGridGatekeeperURI()
{
CheckThreatLevel(ThreatLevel.Moderate, "osGetGridGatekeeperURI");
IConfigSource config = m_ScriptEngine.ConfigSource;
string gatekeeperURI = Util.GetConfigVarFromSections<string>(config, "GatekeeperURI",
new string[] { "Startup", "Hypergrid" }, String.Empty);
if (!string.IsNullOrEmpty(gatekeeperURI))
return gatekeeperURI;
// Legacy. Remove soon!
if (config.Configs["GridService"] != null)
gatekeeperURI = config.Configs["GridService"].GetString("Gatekeeper", gatekeeperURI);
return gatekeeperURI;
return World.SceneGridInfo.HGGateKeeperURLNoEndSlash;
}
public string osGetGridCustom(string key)