ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-08-12 12:25:42 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'opensim:master' into master

Browse Source
This commit is contained in:
AdilElFarissi
2024-04-13 05:44:53 +00:00
committed by GitHub
parent dafc02ac80 25dcfa8b4e
commit af5ad4a43c
10 changed files with 58 additions and 74 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
OpenSim/Framework/Servers/BaseOpenSimServer.cs
View File

@@ -82,8 +82,8 @@ namespace OpenSim.Framework.Servers
m_osSecret = UUID.Random().ToString();
}
private static bool m_NoVerifyCertChain = false;
private static bool m_NoVerifyCertHostname = false;
private static bool m_NoVerifyCertChain = true;
private static bool m_NoVerifyCertHostname = true;
public static bool ValidateServerCertificate(
object sender,

9
OpenSim/Framework/Servers/HttpServer/OSHttpServer/HttpInputItem.cs
View File

@@ -71,8 +71,9 @@ namespace OSHttpServer
/// <returns><see cref="HttpInputItem.Empty"/> if no item was found.</returns>
public HttpInputItem this[string name]
{
get {
return _items.ContainsKey(name) ? _items[name] : Empty;
get
{
return _items.TryGetValue(name, out HttpInputItem hii) ? hii : Empty;
}
}
@@ -144,7 +145,7 @@ namespace OSHttpServer
/// <returns>true if the sub-item exists and has a value; otherwise false.</returns>
public bool Contains(string name)
{
return _items.ContainsKey(name) && _items[name].Value != null;
return _items.TryGetValue(name, out HttpInputItem hii) && hii.Value != null;
}
/// <summary> Returns a formatted representation of the instance with the values of all contained parameters </summary>
@@ -216,7 +217,7 @@ namespace OSHttpServer
{
get
{
return _items.ContainsKey(name) ? _items[name] : Empty;
return _items.TryGetValue(name, out HttpInputItem hii) ? hii : Empty;
}
}

5
OpenSim/Region/Framework/Scenes/GodController.cs
View File

@@ -240,9 +240,8 @@ namespace OpenSim.Region.Framework.Scenes
if(state != null)
{
OSDMap s = (OSDMap)state;
if (s.ContainsKey("ViewerUiIsGod"))
newstate = s["ViewerUiIsGod"].AsBoolean();
if (s.TryGetValue("ViewerUiIsGod", out OSD tmp))
newstate = tmp.AsBoolean();
m_lastLevelToViewer = m_viewergodlevel; // we are not changing viewer level by default
}
UpdateGodLevels(newstate);

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

@@ -833,9 +833,9 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
return Math.Tan(f);
}
public LSL_Float llAtan2(LSL_Float x, LSL_Float y)
public LSL_Float llAtan2(LSL_Float y, LSL_Float x)
{
return Math.Atan2(x, y);
return Math.Atan2(y, x);
}
public LSL_Float llSqrt(double f)

6
OpenSim/Region/ScriptEngine/Shared/Api/Interface/ILSL_Api.cs
View File

@@ -43,7 +43,9 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api.Interfaces
{
void state(string newState);
//ApiDesc Returns absolute version as val (ie as postive value)
LSL_Integer llAbs(LSL_Integer val);
//ApiDesc Returns cosine of val (val in radians)
LSL_Float llAcos(LSL_Float val);
//ApiDesc Sleep 0.1
void llAddToLandBanList(LSL_Key avatarId, LSL_Float hours);
@@ -55,8 +57,10 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api.Interfaces
LSL_Float llAngleBetween(LSL_Rotation a, LSL_Rotation b);
void llApplyImpulse(LSL_Vector force, LSL_Integer local);
void llApplyRotationalImpulse(LSL_Vector force, int local);
//ApiDesc Returns sine of val (val in radians)
LSL_Float llAsin(LSL_Float val);
LSL_Float llAtan2(LSL_Float x, LSL_Float y);
//ApiDesc Returns the angle whose tangent is the y/x
LSL_Float llAtan2(LSL_Float y, LSL_Float x);
void llAttachToAvatar(LSL_Integer attachment);
void llAttachToAvatarTemp(LSL_Integer attachmentPoint);
LSL_Key llAvatarOnSitTarget();

4
OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Stub.cs
View File

@@ -123,9 +123,9 @@ namespace OpenSim.Region.ScriptEngine.Shared.ScriptBase
}
[MethodImpl(MethodImplOptions.AggressiveInlining)]
public LSL_Float llAtan2(LSL_Float x, LSL_Float y)
public LSL_Float llAtan2(LSL_Float y, LSL_Float x)
{
return m_LSL_Functions.llAtan2(x, y);
return m_LSL_Functions.llAtan2(y, x);
}
[MethodImpl(MethodImplOptions.AggressiveInlining)]

5
OpenSim/Server/ServerMain.cs
View File

@@ -101,9 +101,7 @@ namespace OpenSim.Server
ServicePointManager.Expect100Continue = false;
ServicePointManager.UseNagleAlgorithm = false;
ServicePointManager.ServerCertificateValidationCallback = ValidateServerCertificate;
WebUtil.SetupHTTPClients(m_NoVerifyCertChain, m_NoVerifyCertHostname, null, 32);
m_Server = new HttpServerBase("R.O.B.U.S.T.", args);
string registryLocation;
@@ -121,6 +119,7 @@ namespace OpenSim.Server
m_NoVerifyCertChain = serverConfig.GetBoolean("NoVerifyCertChain", m_NoVerifyCertChain);
m_NoVerifyCertHostname = serverConfig.GetBoolean("NoVerifyCertHostname", m_NoVerifyCertHostname);
WebUtil.SetupHTTPClients(m_NoVerifyCertChain, m_NoVerifyCertHostname, null, 32);
string connList = serverConfig.GetString("ServiceConnectors", string.Empty);