diff options
| author | Melanie | 2012-12-28 08:32:34 +0000 |
|---|---|---|
| committer | Melanie | 2012-12-28 08:32:34 +0000 |
| commit | 3ab1bd04031ca0bc1039e4e1d267ea19d0017430 (patch) | |
| tree | 3f2417f3b96e151642158d29d1982dee2bd850a8 /OpenSim/Region/Physics/BulletSNPlugin/BSConstraint.cs | |
| parent | Merge branch 'master' into careminster (diff) | |
| parent | BulletSim: correct collision mask definition for linkset children. (diff) | |
| download | opensim-SC-3ab1bd04031ca0bc1039e4e1d267ea19d0017430.zip opensim-SC-3ab1bd04031ca0bc1039e4e1d267ea19d0017430.tar.gz opensim-SC-3ab1bd04031ca0bc1039e4e1d267ea19d0017430.tar.bz2 opensim-SC-3ab1bd04031ca0bc1039e4e1d267ea19d0017430.tar.xz | |
Merge branch 'master' into careminster
Conflicts:
OpenSim/Region/Framework/Scenes/ScenePresence.cs
Diffstat (limited to '')
| -rw-r--r-- | OpenSim/Region/Physics/BulletSNPlugin/BSConstraint.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Region/Physics/BulletSNPlugin/BSConstraint.cs b/OpenSim/Region/Physics/BulletSNPlugin/BSConstraint.cs index 426bdc2..f1bed39 100644 --- a/OpenSim/Region/Physics/BulletSNPlugin/BSConstraint.cs +++ b/OpenSim/Region/Physics/BulletSNPlugin/BSConstraint.cs | |||
| @@ -36,7 +36,7 @@ public abstract class BSConstraint : IDisposable | |||
| 36 | { | 36 | { |
| 37 | private static string LogHeader = "[BULLETSIM CONSTRAINT]"; | 37 | private static string LogHeader = "[BULLETSIM CONSTRAINT]"; |
| 38 | 38 | ||
| 39 | protected BulletSim m_world; | 39 | protected BulletWorld m_world; |
| 40 | protected BulletBody m_body1; | 40 | protected BulletBody m_body1; |
| 41 | protected BulletBody m_body2; | 41 | protected BulletBody m_body2; |
| 42 | protected BulletConstraint m_constraint; | 42 | protected BulletConstraint m_constraint; |