diff options
| author | Melanie | 2012-05-31 03:37:43 +0100 |
|---|---|---|
| committer | Melanie | 2012-05-31 03:37:43 +0100 |
| commit | e696d1d95225e3ddf90c823a2309dd8760af935b (patch) | |
| tree | 8a72f0f86f2e6fd6e2e5d779993699b66f2c8ef9 /OpenSim/Region/Physics/UbitOdePlugin/ODECharacter.cs | |
| parent | Merge branch 'master' into careminster (diff) | |
| parent | ubitode prim: if makebody() is called already having a body, do a full destru... (diff) | |
| download | opensim-SC-e696d1d95225e3ddf90c823a2309dd8760af935b.zip opensim-SC-e696d1d95225e3ddf90c823a2309dd8760af935b.tar.gz opensim-SC-e696d1d95225e3ddf90c823a2309dd8760af935b.tar.bz2 opensim-SC-e696d1d95225e3ddf90c823a2309dd8760af935b.tar.xz | |
Merge branch 'avination' into careminster
Conflicts:
OpenSim/Region/Framework/Scenes/ScenePresence.cs
Diffstat (limited to '')
| -rw-r--r-- | OpenSim/Region/Physics/UbitOdePlugin/ODECharacter.cs | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/OpenSim/Region/Physics/UbitOdePlugin/ODECharacter.cs b/OpenSim/Region/Physics/UbitOdePlugin/ODECharacter.cs index 093bc3c..6e4e41f 100644 --- a/OpenSim/Region/Physics/UbitOdePlugin/ODECharacter.cs +++ b/OpenSim/Region/Physics/UbitOdePlugin/ODECharacter.cs | |||
| @@ -1118,6 +1118,7 @@ namespace OpenSim.Region.Physics.OdePlugin | |||
| 1118 | if (CollisionEventsThisFrame == null) | 1118 | if (CollisionEventsThisFrame == null) |
| 1119 | CollisionEventsThisFrame = new CollisionEventUpdate(); | 1119 | CollisionEventsThisFrame = new CollisionEventUpdate(); |
| 1120 | CollisionEventsThisFrame.AddCollider(CollidedWith, contact); | 1120 | CollisionEventsThisFrame.AddCollider(CollidedWith, contact); |
| 1121 | _parent_scene.AddCollisionEventReporting(this); | ||
| 1121 | } | 1122 | } |
| 1122 | 1123 | ||
| 1123 | public void SendCollisions() | 1124 | public void SendCollisions() |