aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Physics/BulletSPlugin/BSDynamics.cs
diff options
context:
space:
mode:
authorteravus2013-02-07 10:28:26 -0500
committerteravus2013-02-07 10:50:17 -0500
commit94a5232d3a07c3ff5f9b720dfc975848d750f423 (patch)
treef2329adf59b6525528db1e7e099e8beddaf39a6d /OpenSim/Region/Physics/BulletSPlugin/BSDynamics.cs
parentThis is the final commit that enables the Websocket handler (diff)
parentRename "Bounciness" to "Restitution" (diff)
downloadopensim-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/BSDynamics.cs')
-rw-r--r--OpenSim/Region/Physics/BulletSPlugin/BSDynamics.cs2
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSDynamics.cs b/OpenSim/Region/Physics/BulletSPlugin/BSDynamics.cs
index 8ecf2ff..b51e9fd 100644
--- a/OpenSim/Region/Physics/BulletSPlugin/BSDynamics.cs
+++ b/OpenSim/Region/Physics/BulletSPlugin/BSDynamics.cs
@@ -1326,7 +1326,7 @@ namespace OpenSim.Region.Physics.BulletSPlugin
1326 // If verticalError.Z is negative, the vehicle is upside down. Add additional push. 1326 // If verticalError.Z is negative, the vehicle is upside down. Add additional push.
1327 if (verticalError.Z < 0f) 1327 if (verticalError.Z < 0f)
1328 { 1328 {
1329 vertContributionV.X += PIOverFour; 1329 vertContributionV.X += Math.Sign(vertContributionV.X) * PIOverFour;
1330 // vertContribution.Y -= PIOverFour; 1330 // vertContribution.Y -= PIOverFour;
1331 } 1331 }
1332 1332