diff options
Diffstat (limited to 'OpenSim/Region/PhysicsModules/ubOde/ODECharacter.cs')
-rw-r--r-- | OpenSim/Region/PhysicsModules/ubOde/ODECharacter.cs | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/OpenSim/Region/PhysicsModules/ubOde/ODECharacter.cs b/OpenSim/Region/PhysicsModules/ubOde/ODECharacter.cs index cef7063..c9489d2 100644 --- a/OpenSim/Region/PhysicsModules/ubOde/ODECharacter.cs +++ b/OpenSim/Region/PhysicsModules/ubOde/ODECharacter.cs | |||
@@ -1605,18 +1605,17 @@ namespace OpenSim.Region.PhysicsModule.ubOde | |||
1605 | if (m_cureventsubscription < m_eventsubscription) | 1605 | if (m_cureventsubscription < m_eventsubscription) |
1606 | return; | 1606 | return; |
1607 | 1607 | ||
1608 | m_cureventsubscription = 0; | ||
1609 | |||
1610 | int ncolisions = CollisionEventsThisFrame.m_objCollisionList.Count; | 1608 | int ncolisions = CollisionEventsThisFrame.m_objCollisionList.Count; |
1611 | 1609 | ||
1612 | if (!SentEmptyCollisionsEvent || ncolisions > 0) | 1610 | if (!SentEmptyCollisionsEvent || ncolisions > 0) |
1613 | { | 1611 | { |
1614 | base.SendCollisionUpdate(CollisionEventsThisFrame); | 1612 | base.SendCollisionUpdate(CollisionEventsThisFrame); |
1613 | m_cureventsubscription = 0; | ||
1615 | 1614 | ||
1616 | if (ncolisions == 0) | 1615 | if (ncolisions == 0) |
1617 | { | 1616 | { |
1618 | SentEmptyCollisionsEvent = true; | 1617 | SentEmptyCollisionsEvent = true; |
1619 | _parent_scene.RemoveCollisionEventReporting(this); | 1618 | // _parent_scene.RemoveCollisionEventReporting(this); |
1620 | } | 1619 | } |
1621 | else | 1620 | else |
1622 | { | 1621 | { |