diff options
| author | Melanie | 2012-08-31 01:32:18 +0100 |
|---|---|---|
| committer | Melanie | 2012-08-31 01:32:18 +0100 |
| commit | 1b15144208d925bf1fe6c545616b533faf8945ea (patch) | |
| tree | a7720bb8c2ddcdc1470cf991e26c62b2b1a46be9 /OpenSim/Region/Framework | |
| parent | Merge branch 'avination' into careminster (diff) | |
| parent | Replace SendBannedUserList with Avination's version. Untested in core. Not ev... (diff) | |
| download | opensim-SC-1b15144208d925bf1fe6c545616b533faf8945ea.zip opensim-SC-1b15144208d925bf1fe6c545616b533faf8945ea.tar.gz opensim-SC-1b15144208d925bf1fe6c545616b533faf8945ea.tar.bz2 opensim-SC-1b15144208d925bf1fe6c545616b533faf8945ea.tar.xz | |
Merge branch 'master' into careminster
Conflicts:
OpenSim/Data/MySQL/MySQLSimulationData.cs
OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
OpenSim/Region/CoreModules/Scripting/LSLHttp/UrlModule.cs
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs
Diffstat (limited to 'OpenSim/Region/Framework')
| -rw-r--r-- | OpenSim/Region/Framework/Interfaces/IUrlModule.cs | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/OpenSim/Region/Framework/Interfaces/IUrlModule.cs b/OpenSim/Region/Framework/Interfaces/IUrlModule.cs index 457444c..79e9f9d 100644 --- a/OpenSim/Region/Framework/Interfaces/IUrlModule.cs +++ b/OpenSim/Region/Framework/Interfaces/IUrlModule.cs | |||
| @@ -39,6 +39,8 @@ namespace OpenSim.Region.Framework.Interfaces | |||
| 39 | UUID RequestSecureURL(IScriptModule engine, SceneObjectPart host, UUID itemID); | 39 | UUID RequestSecureURL(IScriptModule engine, SceneObjectPart host, UUID itemID); |
| 40 | void ReleaseURL(string url); | 40 | void ReleaseURL(string url); |
| 41 | void HttpResponse(UUID request, int status, string body); | 41 | void HttpResponse(UUID request, int status, string body); |
| 42 | void HttpContentType(UUID request, string type); | ||
| 43 | |||
| 42 | string GetHttpHeader(UUID request, string header); | 44 | string GetHttpHeader(UUID request, string header); |
| 43 | int GetFreeUrls(); | 45 | int GetFreeUrls(); |
| 44 | 46 | ||