diff options
Merge branch 'master' into careminster
Conflicts:
OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
Diffstat (limited to 'OpenSim/Framework/Servers/HttpServer/OSHttpRequest.cs')
| -rw-r--r-- | OpenSim/Framework/Servers/HttpServer/OSHttpRequest.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Framework/Servers/HttpServer/OSHttpRequest.cs b/OpenSim/Framework/Servers/HttpServer/OSHttpRequest.cs index fc8daf3..3171759 100644 --- a/OpenSim/Framework/Servers/HttpServer/OSHttpRequest.cs +++ b/OpenSim/Framework/Servers/HttpServer/OSHttpRequest.cs | |||
| @@ -107,7 +107,7 @@ namespace OpenSim.Framework.Servers.HttpServer | |||
| 107 | 107 | ||
| 108 | public bool IsSecured | 108 | public bool IsSecured |
| 109 | { | 109 | { |
| 110 | get { return _context.Secured; } | 110 | get { return _context.IsSecured; } |
| 111 | } | 111 | } |
| 112 | 112 | ||
| 113 | public bool KeepAlive | 113 | public bool KeepAlive |