ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-08-09 02:36:00 +08:00
Code Issues Packages Projects Releases Wiki Activity

bad merge?

Browse Source
This commit is contained in:
UbitUmarov
2015-09-01 14:54:35 +01:00
parent f811fdfb70 31a50a73cb
commit 371c9dd2af
406 changed files with 62562 additions and 8067 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -58,6 +58,7 @@ namespace OpenSim.Region.Framework.Interfaces
public interface IHttpRequestModule
{
UUID MakeHttpRequest(string url, string parameters, string body);
<<<<<<< HEAD
/// <summary>
/// Starts the http request.
@@ -87,6 +88,10 @@ namespace OpenSim.Region.Framework.Interfaces
/// <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);
}