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/BulletSPlugin/BulletSimData.cs | |
| 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/BulletSPlugin/BulletSimData.cs')
| -rwxr-xr-x | OpenSim/Region/Physics/BulletSPlugin/BulletSimData.cs | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BulletSimData.cs b/OpenSim/Region/Physics/BulletSPlugin/BulletSimData.cs index c7a2f7e..8012d91 100755 --- a/OpenSim/Region/Physics/BulletSPlugin/BulletSimData.cs +++ b/OpenSim/Region/Physics/BulletSPlugin/BulletSimData.cs | |||
| @@ -217,6 +217,10 @@ public static class BulletSimData | |||
| 217 | { | 217 | { |
| 218 | 218 | ||
| 219 | // Map of collisionTypes to flags for collision groups and masks. | 219 | // Map of collisionTypes to flags for collision groups and masks. |
| 220 | // An object's 'group' is the collison groups this object belongs to | ||
| 221 | // An object's 'filter' is the groups another object has to belong to in order to collide with me | ||
| 222 | // A collision happens if ((obj1.group & obj2.filter) != 0) || ((obj2.group & obj1.filter) != 0) | ||
| 223 | // | ||
| 220 | // As mentioned above, don't use the CollisionFilterGroups definitions directly in the code | 224 | // As mentioned above, don't use the CollisionFilterGroups definitions directly in the code |
| 221 | // but, instead, use references to this dictionary. Finding and debugging | 225 | // but, instead, use references to this dictionary. Finding and debugging |
| 222 | // collision flag problems will be made easier. | 226 | // collision flag problems will be made easier. |