aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Framework/Servers/HttpServer
diff options
context:
space:
mode:
authorteravus2013-02-07 10:28:26 -0500
committerteravus2013-02-07 10:50:17 -0500
commit94a5232d3a07c3ff5f9b720dfc975848d750f423 (patch)
treef2329adf59b6525528db1e7e099e8beddaf39a6d /OpenSim/Framework/Servers/HttpServer
parentThis is the final commit that enables the Websocket handler (diff)
parentRename "Bounciness" to "Restitution" (diff)
downloadopensim-SC_OLD-94a5232d3a07c3ff5f9b720dfc975848d750f423.zip
opensim-SC_OLD-94a5232d3a07c3ff5f9b720dfc975848d750f423.tar.gz
opensim-SC_OLD-94a5232d3a07c3ff5f9b720dfc975848d750f423.tar.bz2
opensim-SC_OLD-94a5232d3a07c3ff5f9b720dfc975848d750f423.tar.xz
* Adds Websocket support to baseHttpServer and IHttpServer.cs . This allows modules to set up a websocket server that websocket clients can connect to. An example module is in OptionalModules/Example/WebSocketEchoTest/WebSocketEchoModule.cs
Diffstat (limited to 'OpenSim/Framework/Servers/HttpServer')
-rw-r--r--OpenSim/Framework/Servers/HttpServer/Interfaces/IHttpServer.cs10
-rw-r--r--OpenSim/Framework/Servers/HttpServer/Properties/AssemblyInfo.cs2
2 files changed, 11 insertions, 1 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>
diff --git a/OpenSim/Framework/Servers/HttpServer/Properties/AssemblyInfo.cs b/OpenSim/Framework/Servers/HttpServer/Properties/AssemblyInfo.cs
index 02ecc25..386be2d 100644
--- a/OpenSim/Framework/Servers/HttpServer/Properties/AssemblyInfo.cs
+++ b/OpenSim/Framework/Servers/HttpServer/Properties/AssemblyInfo.cs
@@ -29,5 +29,5 @@ using System.Runtime.InteropServices;
29// Build Number 29// Build Number
30// Revision 30// Revision
31// 31//
32[assembly: AssemblyVersion("0.7.5.*")] 32[assembly: AssemblyVersion("0.7.6.*")]
33[assembly: AssemblyFileVersion("1.0.0.0")] 33[assembly: AssemblyFileVersion("1.0.0.0")]