diff options
| author | Melanie | 2011-10-26 17:48:51 +0100 |
|---|---|---|
| committer | Melanie | 2011-10-26 17:48:51 +0100 |
| commit | 6a96c9546d4fd89f6e9319246cc2270836cf19f7 (patch) | |
| tree | e6492419b9a03cb78435e911b345b4a31f749162 /OpenSim/Region/Physics/ChOdePlugin/ODEPrim.cs | |
| parent | Merge branch 'master' into bigmerge (diff) | |
| parent | Merge branch 'master' of /home/opensim/var/repo/opensim (diff) | |
| download | opensim-SC_OLD-6a96c9546d4fd89f6e9319246cc2270836cf19f7.zip opensim-SC_OLD-6a96c9546d4fd89f6e9319246cc2270836cf19f7.tar.gz opensim-SC_OLD-6a96c9546d4fd89f6e9319246cc2270836cf19f7.tar.bz2 opensim-SC_OLD-6a96c9546d4fd89f6e9319246cc2270836cf19f7.tar.xz | |
Merge branch 'master' into bigmerge
Conflicts:
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
Diffstat (limited to 'OpenSim/Region/Physics/ChOdePlugin/ODEPrim.cs')
| -rw-r--r-- | OpenSim/Region/Physics/ChOdePlugin/ODEPrim.cs | 2 |
1 files changed, 1 insertions, 1 deletions
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() |