diff options
author | UbitUmarov | 2015-09-02 19:54:53 +0100 |
---|---|---|
committer | UbitUmarov | 2015-09-02 19:54:53 +0100 |
commit | a11edceb00b5b86f825bd957bdac9edb91f893dd (patch) | |
tree | c192eae26f3aadf365a66f32fc6d9ade2f0a0c61 /OpenSim/Region/Framework/Interfaces/IHttpRequests.cs | |
parent | bad merge? (diff) | |
download | opensim-SC_OLD-a11edceb00b5b86f825bd957bdac9edb91f893dd.zip opensim-SC_OLD-a11edceb00b5b86f825bd957bdac9edb91f893dd.tar.gz opensim-SC_OLD-a11edceb00b5b86f825bd957bdac9edb91f893dd.tar.bz2 opensim-SC_OLD-a11edceb00b5b86f825bd957bdac9edb91f893dd.tar.xz |
seems to compile ( tests comented out)
Diffstat (limited to 'OpenSim/Region/Framework/Interfaces/IHttpRequests.cs')
-rw-r--r-- | OpenSim/Region/Framework/Interfaces/IHttpRequests.cs | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/OpenSim/Region/Framework/Interfaces/IHttpRequests.cs b/OpenSim/Region/Framework/Interfaces/IHttpRequests.cs index 2f9b222..efc9ddc 100644 --- a/OpenSim/Region/Framework/Interfaces/IHttpRequests.cs +++ b/OpenSim/Region/Framework/Interfaces/IHttpRequests.cs | |||
@@ -58,8 +58,6 @@ namespace OpenSim.Region.Framework.Interfaces | |||
58 | public interface IHttpRequestModule | 58 | public interface IHttpRequestModule |
59 | { | 59 | { |
60 | UUID MakeHttpRequest(string url, string parameters, string body); | 60 | UUID MakeHttpRequest(string url, string parameters, string body); |
61 | <<<<<<< HEAD | ||
62 | |||
63 | /// <summary> | 61 | /// <summary> |
64 | /// Starts the http request. | 62 | /// Starts the http request. |
65 | /// </summary> | 63 | /// </summary> |
@@ -86,12 +84,7 @@ namespace OpenSim.Region.Framework.Interfaces | |||
86 | /// Stop and remove all http requests for the given script. | 84 | /// Stop and remove all http requests for the given script. |
87 | /// </summary> | 85 | /// </summary> |
88 | /// <param name='id'></param> | 86 | /// <param name='id'></param> |
89 | void StopHttpRequestsForScript(UUID id); | ||
90 | |||
91 | ======= | ||
92 | UUID StartHttpRequest(uint localID, UUID itemID, string url, List<string> parameters, Dictionary<string, string> headers, string body); | ||
93 | void StopHttpRequest(uint m_localID, UUID m_itemID); | 87 | void StopHttpRequest(uint m_localID, UUID m_itemID); |
94 | >>>>>>> avn/ubitvar | ||
95 | IServiceRequest GetNextCompletedRequest(); | 88 | IServiceRequest GetNextCompletedRequest(); |
96 | void RemoveCompletedRequest(UUID id); | 89 | void RemoveCompletedRequest(UUID id); |
97 | } | 90 | } |