diff options
author | UbitUmarov | 2015-09-01 14:54:35 +0100 |
---|---|---|
committer | UbitUmarov | 2015-09-01 14:54:35 +0100 |
commit | 371c9dd2af01a2e7422ec901ee1f80757284a78c (patch) | |
tree | 058d2a513cacb12efcce0c0df0ae14ad135dbfe2 /OpenSim/Region/Framework/Interfaces/IHttpRequests.cs | |
parent | remove lixo (diff) | |
parent | dont change camera on crossings (diff) | |
download | opensim-SC_OLD-371c9dd2af01a2e7422ec901ee1f80757284a78c.zip opensim-SC_OLD-371c9dd2af01a2e7422ec901ee1f80757284a78c.tar.gz opensim-SC_OLD-371c9dd2af01a2e7422ec901ee1f80757284a78c.tar.bz2 opensim-SC_OLD-371c9dd2af01a2e7422ec901ee1f80757284a78c.tar.xz |
bad merge?
Diffstat (limited to 'OpenSim/Region/Framework/Interfaces/IHttpRequests.cs')
-rw-r--r-- | OpenSim/Region/Framework/Interfaces/IHttpRequests.cs | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/OpenSim/Region/Framework/Interfaces/IHttpRequests.cs b/OpenSim/Region/Framework/Interfaces/IHttpRequests.cs index 124504c..2f9b222 100644 --- a/OpenSim/Region/Framework/Interfaces/IHttpRequests.cs +++ b/OpenSim/Region/Framework/Interfaces/IHttpRequests.cs | |||
@@ -58,6 +58,7 @@ 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 | ||
61 | 62 | ||
62 | /// <summary> | 63 | /// <summary> |
63 | /// Starts the http request. | 64 | /// Starts the http request. |
@@ -87,6 +88,10 @@ namespace OpenSim.Region.Framework.Interfaces | |||
87 | /// <param name='id'></param> | 88 | /// <param name='id'></param> |
88 | void StopHttpRequestsForScript(UUID id); | 89 | void StopHttpRequestsForScript(UUID id); |
89 | 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); | ||
94 | >>>>>>> avn/ubitvar | ||
90 | IServiceRequest GetNextCompletedRequest(); | 95 | IServiceRequest GetNextCompletedRequest(); |
91 | void RemoveCompletedRequest(UUID id); | 96 | void RemoveCompletedRequest(UUID id); |
92 | } | 97 | } |