* Remove a hack I put into OGP so that I could test OGP over SSL with the SeedCap response not being SSL
parent
cdced699fb
commit
e4ca8e613a
|
@ -408,7 +408,7 @@ namespace OpenSim.Region.Environment.Modules.InterGrid
|
||||||
if (httpSSL)
|
if (httpSSL)
|
||||||
{
|
{
|
||||||
rezHttpProtocol = "https://";
|
rezHttpProtocol = "https://";
|
||||||
|
regionCapsHttpProtocol = "https://";
|
||||||
urlport = httpsslport.ToString();
|
urlport = httpsslport.ToString();
|
||||||
|
|
||||||
if (httpsCN.Length > 0)
|
if (httpsCN.Length > 0)
|
||||||
|
@ -416,8 +416,6 @@ namespace OpenSim.Region.Environment.Modules.InterGrid
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
// Be warned that the two following lines assume http not
|
|
||||||
// https since region caps are not implemented in https currently
|
|
||||||
|
|
||||||
// DEPRECIATED
|
// DEPRECIATED
|
||||||
responseMap["seed_capability"] = LLSD.FromString(regionCapsHttpProtocol + httpaddr + ":" + reg.HttpPort + "/CAPS/" + userCap.CapsObjectPath + "0000/");
|
responseMap["seed_capability"] = LLSD.FromString(regionCapsHttpProtocol + httpaddr + ":" + reg.HttpPort + "/CAPS/" + userCap.CapsObjectPath + "0000/");
|
||||||
|
|
Loading…
Reference in New Issue