diff options
| author | Melanie | 2011-10-26 17:55:53 +0200 |
|---|---|---|
| committer | Melanie | 2011-10-26 17:55:53 +0200 |
| commit | c763419043773c93dbbc865ec35f7ecf856a641a (patch) | |
| tree | ac9f99c33ae788e6b7fdfd0843c2ae584a896dc6 /OpenSim/Region/Physics/ChOdePlugin | |
| parent | Fix a missing locking call (diff) | |
| parent | Merge branch 'master' into bigmerge (diff) | |
| download | opensim-SC-c763419043773c93dbbc865ec35f7ecf856a641a.zip opensim-SC-c763419043773c93dbbc865ec35f7ecf856a641a.tar.gz opensim-SC-c763419043773c93dbbc865ec35f7ecf856a641a.tar.bz2 opensim-SC-c763419043773c93dbbc865ec35f7ecf856a641a.tar.xz | |
Merge branch 'bigmerge' of ssh://3dhosting.de/var/git/careminster into bigmerge
Diffstat (limited to 'OpenSim/Region/Physics/ChOdePlugin')
| -rw-r--r-- | OpenSim/Region/Physics/ChOdePlugin/ODECharacter.cs | 2 | ||||
| -rw-r--r-- | OpenSim/Region/Physics/ChOdePlugin/ODEPrim.cs | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Region/Physics/ChOdePlugin/ODECharacter.cs b/OpenSim/Region/Physics/ChOdePlugin/ODECharacter.cs index 1bce760..58e2e4c 100644 --- a/OpenSim/Region/Physics/ChOdePlugin/ODECharacter.cs +++ b/OpenSim/Region/Physics/ChOdePlugin/ODECharacter.cs | |||
| @@ -1299,7 +1299,7 @@ namespace OpenSim.Region.Physics.OdePlugin | |||
| 1299 | { | 1299 | { |
| 1300 | if (m_eventsubscription > 0) | 1300 | if (m_eventsubscription > 0) |
| 1301 | { | 1301 | { |
| 1302 | CollisionEventsThisFrame.addCollider(CollidedWith, contact); | 1302 | CollisionEventsThisFrame.AddCollider(CollidedWith, contact); |
| 1303 | } | 1303 | } |
| 1304 | } | 1304 | } |
| 1305 | 1305 | ||
diff --git a/OpenSim/Region/Physics/ChOdePlugin/ODEPrim.cs b/OpenSim/Region/Physics/ChOdePlugin/ODEPrim.cs index 82f1b94..5f802d0 100644 --- a/OpenSim/Region/Physics/ChOdePlugin/ODEPrim.cs +++ b/OpenSim/Region/Physics/ChOdePlugin/ODEPrim.cs | |||
| @@ -2438,7 +2438,7 @@ Console.WriteLine("ODEPrim JointCreateFixed !!!"); | |||
| 2438 | { | 2438 | { |
| 2439 | if (CollisionEventsThisFrame == null) | 2439 | if (CollisionEventsThisFrame == null) |
| 2440 | CollisionEventsThisFrame = new CollisionEventUpdate(); | 2440 | CollisionEventsThisFrame = new CollisionEventUpdate(); |
| 2441 | CollisionEventsThisFrame.addCollider(CollidedWith, contact); | 2441 | CollisionEventsThisFrame.AddCollider(CollidedWith, contact); |
| 2442 | } | 2442 | } |
| 2443 | 2443 | ||
| 2444 | public void SendCollisions() | 2444 | public void SendCollisions() |