mirror of
https://github.com/opensim/opensim.git
synced 2026-08-08 18:25:33 +08:00
Add selfsigned certificates support to Robust and osGetLinkInventoryKeys plus some fixes
This commit is contained in:
committed by
UbitUmarov
parent
c2c3ca418a
commit
ac9ed3d5d1
@@ -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"))
|
||||
if (cmdparams[2].StartsWith("http") || cmdparams[2].StartsWith("https"))
|
||||
{
|
||||
RunLinkRegionCommand(cmdparams);
|
||||
}
|
||||
@@ -632,7 +632,11 @@ namespace OpenSim.Services.GridService
|
||||
parameters.Insert(3, parts[2]);
|
||||
cmdparams = (string[])parameters.ToArray(typeof(string));
|
||||
}
|
||||
cmdparams[2] = "http://" + parts[0] + ':' + parts[1];
|
||||
string uri = cmdparams[2].StartsWith("https")
|
||||
? "https://" + parts[0] + ':' + parts[1]
|
||||
: "http://" + parts[0] + ':' + parts[1];
|
||||
|
||||
cmdparams[2] = uri;
|
||||
|
||||
RunLinkRegionCommand(cmdparams);
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user