diff options
| author | UbitUmarov | 2017-01-05 19:32:57 +0000 |
|---|---|---|
| committer | UbitUmarov | 2017-01-05 19:32:57 +0000 |
| commit | 254b26a7d51143d4e08229fa0b0fceabd76a41d0 (patch) | |
| tree | 8ed65006e5dc04e69ceba67e31075a9e505e64f6 /OpenSim/Region/Framework/Interfaces/IHttpRequests.cs | |
| parent | Merge branch 'master' into httptests (diff) | |
| parent | Massive tab and trailing space cleanup (diff) | |
| download | opensim-SC-254b26a7d51143d4e08229fa0b0fceabd76a41d0.zip opensim-SC-254b26a7d51143d4e08229fa0b0fceabd76a41d0.tar.gz opensim-SC-254b26a7d51143d4e08229fa0b0fceabd76a41d0.tar.bz2 opensim-SC-254b26a7d51143d4e08229fa0b0fceabd76a41d0.tar.xz | |
fix merge
Diffstat (limited to 'OpenSim/Region/Framework/Interfaces/IHttpRequests.cs')
| -rw-r--r-- | OpenSim/Region/Framework/Interfaces/IHttpRequests.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Region/Framework/Interfaces/IHttpRequests.cs b/OpenSim/Region/Framework/Interfaces/IHttpRequests.cs index efc9ddc..978c248 100644 --- a/OpenSim/Region/Framework/Interfaces/IHttpRequests.cs +++ b/OpenSim/Region/Framework/Interfaces/IHttpRequests.cs | |||
| @@ -77,7 +77,7 @@ namespace OpenSim.Region.Framework.Interfaces | |||
| 77 | /// then returned via IServiceRequest when the response is asynchronously fetched. | 77 | /// then returned via IServiceRequest when the response is asynchronously fetched. |
| 78 | /// </param> | 78 | /// </param> |
| 79 | UUID StartHttpRequest( | 79 | UUID StartHttpRequest( |
| 80 | uint localID, UUID itemID, string url, List<string> parameters, Dictionary<string, string> headers, string body, | 80 | uint localID, UUID itemID, string url, List<string> parameters, Dictionary<string, string> headers, string body, |
| 81 | out HttpInitialRequestStatus status); | 81 | out HttpInitialRequestStatus status); |
| 82 | 82 | ||
| 83 | /// <summary> | 83 | /// <summary> |