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/BSPhysObject.cs | |
| parent | This is the final commit that enables the Websocket handler (diff) | |
| parent | Rename "Bounciness" to "Restitution" (diff) | |
| download | opensim-SC-94a5232d3a07c3ff5f9b720dfc975848d750f423.zip opensim-SC-94a5232d3a07c3ff5f9b720dfc975848d750f423.tar.gz opensim-SC-94a5232d3a07c3ff5f9b720dfc975848d750f423.tar.bz2 opensim-SC-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/BSPhysObject.cs')
| -rwxr-xr-x | OpenSim/Region/Physics/BulletSPlugin/BSPhysObject.cs | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSPhysObject.cs b/OpenSim/Region/Physics/BulletSPlugin/BSPhysObject.cs index 823402b..ec25aa9 100755 --- a/OpenSim/Region/Physics/BulletSPlugin/BSPhysObject.cs +++ b/OpenSim/Region/Physics/BulletSPlugin/BSPhysObject.cs | |||
| @@ -75,6 +75,7 @@ public abstract class BSPhysObject : PhysicsActor | |||
| 75 | PhysicsScene = parentScene; | 75 | PhysicsScene = parentScene; |
| 76 | LocalID = localID; | 76 | LocalID = localID; |
| 77 | PhysObjectName = name; | 77 | PhysObjectName = name; |
| 78 | Name = name; // PhysicsActor also has the name of the object. Someday consolidate. | ||
| 78 | TypeName = typeName; | 79 | TypeName = typeName; |
| 79 | 80 | ||
| 80 | // We don't have any physical representation yet. | 81 | // We don't have any physical representation yet. |