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

Fixing changes

Browse Source
This commit is contained in:
Adil El Farissi
2024-09-15 22:09:24 +00:00
parent fbd0053581
commit 70f3b02f65
2 changed files with 3 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -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*/)
{

8
OpenSim/Services/GridService/HypergridLinker.cs
View File

@@ -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);
}