ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-08-06 17:32:42 +08:00
Code Issues Packages Projects Releases Wiki Activity

seems to compile ( tests comented out)

Browse Source
This commit is contained in:
UbitUmarov
2015-09-02 19:54:53 +01:00
parent 371c9dd2af
commit a11edceb00
157 changed files with 1315 additions and 9792 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
OpenSim/Region/Framework/Interfaces/IHttpRequests.cs
View File

@@ -58,8 +58,6 @@ namespace OpenSim.Region.Framework.Interfaces
public interface IHttpRequestModule
{
UUID MakeHttpRequest(string url, string parameters, string body);
<<<<<<< HEAD
/// <summary>
/// Starts the http request.
/// </summary>
@@ -86,12 +84,7 @@ namespace OpenSim.Region.Framework.Interfaces
/// Stop and remove all http requests for the given script.
/// </summary>
/// <param name='id'></param>
void StopHttpRequestsForScript(UUID id);
=======
UUID StartHttpRequest(uint localID, UUID itemID, string url, List<string> parameters, Dictionary<string, string> headers, string body);
void StopHttpRequest(uint m_localID, UUID m_itemID);
>>>>>>> avn/ubitvar
IServiceRequest GetNextCompletedRequest();
void RemoveCompletedRequest(UUID id);
}