From e4ca8e613aee247e6369972e26e0b87bee5a1002 Mon Sep 17 00:00:00 2001 From: Teravus Ovares Date: Sun, 14 Sep 2008 23:46:38 +0000 Subject: [PATCH] * Remove a hack I put into OGP so that I could test OGP over SSL with the SeedCap response not being SSL --- .../Environment/Modules/InterGrid/OpenGridProtocolModule.cs | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/OpenSim/Region/Environment/Modules/InterGrid/OpenGridProtocolModule.cs b/OpenSim/Region/Environment/Modules/InterGrid/OpenGridProtocolModule.cs index 68f35e8265..687fa8253a 100644 --- a/OpenSim/Region/Environment/Modules/InterGrid/OpenGridProtocolModule.cs +++ b/OpenSim/Region/Environment/Modules/InterGrid/OpenGridProtocolModule.cs @@ -408,7 +408,7 @@ namespace OpenSim.Region.Environment.Modules.InterGrid if (httpSSL) { rezHttpProtocol = "https://"; - + regionCapsHttpProtocol = "https://"; urlport = httpsslport.ToString(); 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 responseMap["seed_capability"] = LLSD.FromString(regionCapsHttpProtocol + httpaddr + ":" + reg.HttpPort + "/CAPS/" + userCap.CapsObjectPath + "0000/");