diff options
author | Melanie | 2013-03-05 23:57:53 +0000 |
---|---|---|
committer | Melanie | 2013-03-05 23:57:53 +0000 |
commit | 81552f41c601017f43061d923eba393b9f85a7b3 (patch) | |
tree | 5d6c3aba0f72941c06b47eaae6f4cd0301b60b23 /OpenSim/Framework/Servers/HttpServer/Interfaces | |
parent | Merge branch 'avination' into careminster (diff) | |
parent | minor: Fix mono compiler warning in MonitorModule (diff) | |
download | opensim-SC-81552f41c601017f43061d923eba393b9f85a7b3.zip opensim-SC-81552f41c601017f43061d923eba393b9f85a7b3.tar.gz opensim-SC-81552f41c601017f43061d923eba393b9f85a7b3.tar.bz2 opensim-SC-81552f41c601017f43061d923eba393b9f85a7b3.tar.xz |
Merge branch 'master' into careminster
Conflicts:
OpenSim/Region/ClientStack/Linden/Caps/MeshUploadFlagModule.cs
OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs
OpenSim/Region/OptionalModules/Avatar/Attachments/TempAttachmentsModule.cs
Diffstat (limited to 'OpenSim/Framework/Servers/HttpServer/Interfaces')
-rw-r--r-- | OpenSim/Framework/Servers/HttpServer/Interfaces/IHttpServer.cs | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/OpenSim/Framework/Servers/HttpServer/Interfaces/IHttpServer.cs b/OpenSim/Framework/Servers/HttpServer/Interfaces/IHttpServer.cs index 71ca3ff..d162bc1 100644 --- a/OpenSim/Framework/Servers/HttpServer/Interfaces/IHttpServer.cs +++ b/OpenSim/Framework/Servers/HttpServer/Interfaces/IHttpServer.cs | |||
@@ -140,6 +140,8 @@ namespace OpenSim.Framework.Servers.HttpServer | |||
140 | void RemoveStreamHandler(string httpMethod, string path); | 140 | void RemoveStreamHandler(string httpMethod, string path); |
141 | 141 | ||
142 | void RemoveXmlRPCHandler(string method); | 142 | void RemoveXmlRPCHandler(string method); |
143 | |||
144 | void RemoveJsonRPCHandler(string method); | ||
143 | 145 | ||
144 | string GetHTTP404(string host); | 146 | string GetHTTP404(string host); |
145 | 147 | ||