diff options
| author | Justin Clark-Casey (justincc) | 2013-02-07 23:09:47 +0000 |
|---|---|---|
| committer | Justin Clark-Casey (justincc) | 2013-02-07 23:09:47 +0000 |
| commit | 9e17dc3daa04644c1a565d819a614c02022bdeed (patch) | |
| tree | 014eb8cec88c68b2dedde009a508dde3b5b52aca /OpenSim/Framework/Servers/HttpServer/Interfaces | |
| parent | Fix a recent regression in e17392a where JsonSetValue() stopped working (prob... (diff) | |
| parent | Plumb the path from the client to the extra physics params and back (diff) | |
| download | opensim-SC_OLD-9e17dc3daa04644c1a565d819a614c02022bdeed.zip opensim-SC_OLD-9e17dc3daa04644c1a565d819a614c02022bdeed.tar.gz opensim-SC_OLD-9e17dc3daa04644c1a565d819a614c02022bdeed.tar.bz2 opensim-SC_OLD-9e17dc3daa04644c1a565d819a614c02022bdeed.tar.xz | |
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
Diffstat (limited to 'OpenSim/Framework/Servers/HttpServer/Interfaces')
| -rw-r--r-- | OpenSim/Framework/Servers/HttpServer/Interfaces/IHttpServer.cs | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/OpenSim/Framework/Servers/HttpServer/Interfaces/IHttpServer.cs b/OpenSim/Framework/Servers/HttpServer/Interfaces/IHttpServer.cs index 13b5dd3..71ca3ff 100644 --- a/OpenSim/Framework/Servers/HttpServer/Interfaces/IHttpServer.cs +++ b/OpenSim/Framework/Servers/HttpServer/Interfaces/IHttpServer.cs | |||
| @@ -98,7 +98,17 @@ namespace OpenSim.Framework.Servers.HttpServer | |||
| 98 | bool AddXmlRPCHandler(string method, XmlRpcMethod handler, bool keepAlive); | 98 | bool AddXmlRPCHandler(string method, XmlRpcMethod handler, bool keepAlive); |
| 99 | 99 | ||
| 100 | bool AddJsonRPCHandler(string method, JsonRPCMethod handler); | 100 | bool AddJsonRPCHandler(string method, JsonRPCMethod handler); |
| 101 | |||
| 102 | /// <summary> | ||
| 103 | /// Websocket HTTP server handlers. | ||
| 104 | /// </summary> | ||
| 105 | /// <param name="servicepath"></param> | ||
| 106 | /// <param name="handler"></param> | ||
| 107 | void AddWebSocketHandler(string servicepath, BaseHttpServer.WebSocketRequestDelegate handler); | ||
| 108 | |||
| 101 | 109 | ||
| 110 | void RemoveWebSocketHandler(string servicepath); | ||
| 111 | |||
| 102 | /// <summary> | 112 | /// <summary> |
| 103 | /// Gets the XML RPC handler for given method name | 113 | /// Gets the XML RPC handler for given method name |
| 104 | /// </summary> | 114 | /// </summary> |