diff options
author | David Walter Seikel | 2016-11-03 21:44:39 +1000 |
---|---|---|
committer | David Walter Seikel | 2016-11-03 21:44:39 +1000 |
commit | 134f86e8d5c414409631b25b8c6f0ee45fbd8631 (patch) | |
tree | 216b89d3fb89acfb81be1e440c25c41ab09fa96d /OpenSim/Region/Physics/BulletSPlugin/BSConstraint.cs | |
parent | More changing to production grid. Double oops. (diff) | |
download | opensim-SC-134f86e8d5c414409631b25b8c6f0ee45fbd8631.zip opensim-SC-134f86e8d5c414409631b25b8c6f0ee45fbd8631.tar.gz opensim-SC-134f86e8d5c414409631b25b8c6f0ee45fbd8631.tar.bz2 opensim-SC-134f86e8d5c414409631b25b8c6f0ee45fbd8631.tar.xz |
Initial update to OpenSim 0.8.2.1 source code.
Diffstat (limited to '')
-rwxr-xr-x | OpenSim/Region/PhysicsModules/BulletS/BSConstraint.cs (renamed from OpenSim/Region/Physics/BulletSPlugin/BSConstraint.cs) | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSConstraint.cs b/OpenSim/Region/PhysicsModules/BulletS/BSConstraint.cs index b813974..e42e868 100755 --- a/OpenSim/Region/Physics/BulletSPlugin/BSConstraint.cs +++ b/OpenSim/Region/PhysicsModules/BulletS/BSConstraint.cs | |||
@@ -29,7 +29,7 @@ using System.Collections.Generic; | |||
29 | using System.Text; | 29 | using System.Text; |
30 | using OpenMetaverse; | 30 | using OpenMetaverse; |
31 | 31 | ||
32 | namespace OpenSim.Region.Physics.BulletSPlugin | 32 | namespace OpenSim.Region.PhysicsModule.BulletS |
33 | { | 33 | { |
34 | 34 | ||
35 | public abstract class BSConstraint : IDisposable | 35 | public abstract class BSConstraint : IDisposable |
@@ -64,7 +64,7 @@ public abstract class BSConstraint : IDisposable | |||
64 | { | 64 | { |
65 | bool success = PhysicsScene.PE.DestroyConstraint(m_world, m_constraint); | 65 | bool success = PhysicsScene.PE.DestroyConstraint(m_world, m_constraint); |
66 | m_world.physicsScene.DetailLog("{0},BSConstraint.Dispose,taint,id1={1},body1={2},id2={3},body2={4},success={5}", | 66 | m_world.physicsScene.DetailLog("{0},BSConstraint.Dispose,taint,id1={1},body1={2},id2={3},body2={4},success={5}", |
67 | BSScene.DetailLogZero, | 67 | m_body1.ID, |
68 | m_body1.ID, m_body1.AddrString, | 68 | m_body1.ID, m_body1.AddrString, |
69 | m_body2.ID, m_body2.AddrString, | 69 | m_body2.ID, m_body2.AddrString, |
70 | success); | 70 | success); |
@@ -77,7 +77,10 @@ public abstract class BSConstraint : IDisposable | |||
77 | { | 77 | { |
78 | bool ret = false; | 78 | bool ret = false; |
79 | if (m_enabled) | 79 | if (m_enabled) |
80 | { | ||
81 | m_world.physicsScene.DetailLog("{0},BSConstraint.SetLinearLimits,taint,low={1},high={2}", m_body1.ID, low, high); | ||
80 | ret = PhysicsScene.PE.SetLinearLimits(m_constraint, low, high); | 82 | ret = PhysicsScene.PE.SetLinearLimits(m_constraint, low, high); |
83 | } | ||
81 | return ret; | 84 | return ret; |
82 | } | 85 | } |
83 | 86 | ||
@@ -85,7 +88,10 @@ public abstract class BSConstraint : IDisposable | |||
85 | { | 88 | { |
86 | bool ret = false; | 89 | bool ret = false; |
87 | if (m_enabled) | 90 | if (m_enabled) |
91 | { | ||
92 | m_world.physicsScene.DetailLog("{0},BSConstraint.SetAngularLimits,taint,low={1},high={2}", m_body1.ID, low, high); | ||
88 | ret = PhysicsScene.PE.SetAngularLimits(m_constraint, low, high); | 93 | ret = PhysicsScene.PE.SetAngularLimits(m_constraint, low, high); |
94 | } | ||
89 | return ret; | 95 | return ret; |
90 | } | 96 | } |
91 | 97 | ||