From 70f3b02f65e148a643193dbc7202a4b61b7fd5f5 Mon Sep 17 00:00:00 2001 From: Adil El Farissi <144741970+AdilElFarissi@users.noreply.github.com> Date: Sun, 15 Sep 2024 22:09:24 +0000 Subject: [PATCH] Fixing changes --- .../Shared/Api/Implementation/OSSL_Api.cs | 17 +---------------- OpenSim/Services/GridService/HypergridLinker.cs | 8 ++------ 2 files changed, 3 insertions(+), 22 deletions(-) diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs index dec34c97ff..a01bc3c320 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs @@ -2481,7 +2481,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api { UserAgentServiceConnector userConnection = new(serverURI); - if (userConnection is not null && serverURI.StartsWith("http://")) + if (userConnection is not null) { userID = userConnection.GetUUID(realFirstName, realLastName); if (!userID.IsZero()) @@ -2490,21 +2490,6 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api return userID.ToString(); } } - else - { - // Override hardcoded http in Util.ParseForeignAvatarName - string SSLserverURI = serverURI.Replace("http://", "https://"); - userConnection = new(SSLserverURI); - if (userConnection is not null) - { - userID = userConnection.GetUUID(realFirstName, realLastName); - if (!userID.IsZero()) - { - userManager.AddUser(userID, realFirstName, realLastName, SSLserverURI); - return userID.ToString(); - } - } - } } catch (Exception /*e*/) { diff --git a/OpenSim/Services/GridService/HypergridLinker.cs b/OpenSim/Services/GridService/HypergridLinker.cs index ba2dc78c6f..d9f5a22e20 100644 --- a/OpenSim/Services/GridService/HypergridLinker.cs +++ b/OpenSim/Services/GridService/HypergridLinker.cs @@ -617,7 +617,7 @@ namespace OpenSim.Services.GridService } //this should be the prefererred way of setting up hg links now - if (cmdparams[2].StartsWith("http") || cmdparams[2].StartsWith("https")) + if (cmdparams[2].StartsWith("http")) { RunLinkRegionCommand(cmdparams); } @@ -632,11 +632,7 @@ namespace OpenSim.Services.GridService parameters.Insert(3, parts[2]); cmdparams = (string[])parameters.ToArray(typeof(string)); } - string uri = cmdparams[2].StartsWith("https") - ? "https://" + parts[0] + ':' + parts[1] - : "http://" + parts[0] + ':' + parts[1]; - - cmdparams[2] = uri; + cmdparams[2] = "http://" + parts[0] + ':' + parts[1]; RunLinkRegionCommand(cmdparams); }