diff options
Merge branch 'master' into careminster
Conflicts:
OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs
OpenSim/Region/CoreModules/Scripting/HttpRequest/ScriptsHttpRequests.cs
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
Diffstat (limited to 'OpenSim/Region/Framework/Interfaces')
| -rw-r--r-- | OpenSim/Region/Framework/Interfaces/IHttpRequests.cs | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/OpenSim/Region/Framework/Interfaces/IHttpRequests.cs b/OpenSim/Region/Framework/Interfaces/IHttpRequests.cs index de0f2a3..eb6c5ac 100644 --- a/OpenSim/Region/Framework/Interfaces/IHttpRequests.cs +++ b/OpenSim/Region/Framework/Interfaces/IHttpRequests.cs | |||
| @@ -36,6 +36,9 @@ namespace OpenSim.Region.Framework.Interfaces | |||
| 36 | HTTP_MIMETYPE = 1, | 36 | HTTP_MIMETYPE = 1, |
| 37 | HTTP_BODY_MAXLENGTH = 2, | 37 | HTTP_BODY_MAXLENGTH = 2, |
| 38 | HTTP_VERIFY_CERT = 3, | 38 | HTTP_VERIFY_CERT = 3, |
| 39 | HTTP_VERBOSE_THROTTLE = 4, | ||
| 40 | HTTP_CUSTOM_HEADER = 5, | ||
| 41 | HTTP_PRAGMA_NO_CACHE = 6 | ||
| 39 | } | 42 | } |
| 40 | 43 | ||
| 41 | public interface IHttpRequestModule | 44 | public interface IHttpRequestModule |