diff options
| author | teravus | 2013-02-07 10:28:26 -0500 |
|---|---|---|
| committer | teravus | 2013-02-07 10:50:17 -0500 |
| commit | 94a5232d3a07c3ff5f9b720dfc975848d750f423 (patch) | |
| tree | f2329adf59b6525528db1e7e099e8beddaf39a6d /OpenSim/Region/Physics/Manager | |
| parent | This is the final commit that enables the Websocket handler (diff) | |
| parent | Rename "Bounciness" to "Restitution" (diff) | |
| download | opensim-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/Region/Physics/Manager')
| -rw-r--r-- | OpenSim/Region/Physics/Manager/AssemblyInfo.cs | 2 | ||||
| -rw-r--r-- | OpenSim/Region/Physics/Manager/IMesher.cs | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/OpenSim/Region/Physics/Manager/AssemblyInfo.cs b/OpenSim/Region/Physics/Manager/AssemblyInfo.cs index 36b4235..5da3956 100644 --- a/OpenSim/Region/Physics/Manager/AssemblyInfo.cs +++ b/OpenSim/Region/Physics/Manager/AssemblyInfo.cs | |||
| @@ -55,4 +55,4 @@ using System.Runtime.InteropServices; | |||
| 55 | // You can specify all values by your own or you can build default build and revision | 55 | // You can specify all values by your own or you can build default build and revision |
| 56 | // numbers with the '*' character (the default): | 56 | // numbers with the '*' character (the default): |
| 57 | 57 | ||
| 58 | [assembly : AssemblyVersion("0.7.5.*")] | 58 | [assembly : AssemblyVersion("0.7.6.*")] |
diff --git a/OpenSim/Region/Physics/Manager/IMesher.cs b/OpenSim/Region/Physics/Manager/IMesher.cs index 10c4bd3..2e7bb5d 100644 --- a/OpenSim/Region/Physics/Manager/IMesher.cs +++ b/OpenSim/Region/Physics/Manager/IMesher.cs | |||
| @@ -59,6 +59,7 @@ namespace OpenSim.Region.Physics.Manager | |||
| 59 | List<Vector3> getVertexList(); | 59 | List<Vector3> getVertexList(); |
| 60 | int[] getIndexListAsInt(); | 60 | int[] getIndexListAsInt(); |
| 61 | int[] getIndexListAsIntLocked(); | 61 | int[] getIndexListAsIntLocked(); |
| 62 | float[] getVertexListAsFloat(); | ||
| 62 | float[] getVertexListAsFloatLocked(); | 63 | float[] getVertexListAsFloatLocked(); |
| 63 | void getIndexListAsPtrToIntArray(out IntPtr indices, out int triStride, out int indexCount); | 64 | void getIndexListAsPtrToIntArray(out IntPtr indices, out int triStride, out int indexCount); |
| 64 | void getVertexListAsPtrToFloatArray(out IntPtr vertexList, out int vertexStride, out int vertexCount); | 65 | void getVertexListAsPtrToFloatArray(out IntPtr vertexList, out int vertexStride, out int vertexCount); |