diff options
| author | Teravus Ovares | 2008-09-14 23:46:38 +0000 |
|---|---|---|
| committer | Teravus Ovares | 2008-09-14 23:46:38 +0000 |
| commit | e4ca8e613aee247e6369972e26e0b87bee5a1002 (patch) | |
| tree | 12fd5347d946b39730204ca0bd8eb8ab1b6e79d2 /OpenSim | |
| parent | * Made Seed CAP response respect the SSL setting. (diff) | |
| download | opensim-SC-e4ca8e613aee247e6369972e26e0b87bee5a1002.zip opensim-SC-e4ca8e613aee247e6369972e26e0b87bee5a1002.tar.gz opensim-SC-e4ca8e613aee247e6369972e26e0b87bee5a1002.tar.bz2 opensim-SC-e4ca8e613aee247e6369972e26e0b87bee5a1002.tar.xz | |
* Remove a hack I put into OGP so that I could test OGP over SSL with the SeedCap response not being SSL
Diffstat (limited to 'OpenSim')
| -rw-r--r-- | OpenSim/Region/Environment/Modules/InterGrid/OpenGridProtocolModule.cs | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/OpenSim/Region/Environment/Modules/InterGrid/OpenGridProtocolModule.cs b/OpenSim/Region/Environment/Modules/InterGrid/OpenGridProtocolModule.cs index 68f35e8..687fa82 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 | |||
| 408 | if (httpSSL) | 408 | if (httpSSL) |
| 409 | { | 409 | { |
| 410 | rezHttpProtocol = "https://"; | 410 | rezHttpProtocol = "https://"; |
| 411 | 411 | regionCapsHttpProtocol = "https://"; | |
| 412 | urlport = httpsslport.ToString(); | 412 | urlport = httpsslport.ToString(); |
| 413 | 413 | ||
| 414 | if (httpsCN.Length > 0) | 414 | if (httpsCN.Length > 0) |
| @@ -416,8 +416,6 @@ namespace OpenSim.Region.Environment.Modules.InterGrid | |||
| 416 | } | 416 | } |
| 417 | 417 | ||
| 418 | 418 | ||
| 419 | // Be warned that the two following lines assume http not | ||
| 420 | // https since region caps are not implemented in https currently | ||
| 421 | 419 | ||
| 422 | // DEPRECIATED | 420 | // DEPRECIATED |
| 423 | responseMap["seed_capability"] = LLSD.FromString(regionCapsHttpProtocol + httpaddr + ":" + reg.HttpPort + "/CAPS/" + userCap.CapsObjectPath + "0000/"); | 421 | responseMap["seed_capability"] = LLSD.FromString(regionCapsHttpProtocol + httpaddr + ":" + reg.HttpPort + "/CAPS/" + userCap.CapsObjectPath + "0000/"); |