diff options
| author | UbitUmarov | 2016-07-24 22:33:31 +0100 |
|---|---|---|
| committer | UbitUmarov | 2016-07-24 22:33:31 +0100 |
| commit | 0a9f06fda77b4f23274b5804dca56e5b615dcc25 (patch) | |
| tree | accf784c11681ee0c398086623f6a46d4f4ea617 /OpenSim/Region | |
| parent | ubOde still on relative velocity. Make ubOde report avatar empty collisions ... (diff) | |
| download | opensim-SC-0a9f06fda77b4f23274b5804dca56e5b615dcc25.zip opensim-SC-0a9f06fda77b4f23274b5804dca56e5b615dcc25.tar.gz opensim-SC-0a9f06fda77b4f23274b5804dca56e5b615dcc25.tar.bz2 opensim-SC-0a9f06fda77b4f23274b5804dca56e5b615dcc25.tar.xz | |
ubOde actually revert last change don't send unnecessary empty collisions, will patch it elsewhere
Diffstat (limited to 'OpenSim/Region')
| -rw-r--r-- | OpenSim/Region/PhysicsModules/ubOde/ODECharacter.cs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Region/PhysicsModules/ubOde/ODECharacter.cs b/OpenSim/Region/PhysicsModules/ubOde/ODECharacter.cs index 98f2eac..1b03b3c 100644 --- a/OpenSim/Region/PhysicsModules/ubOde/ODECharacter.cs +++ b/OpenSim/Region/PhysicsModules/ubOde/ODECharacter.cs | |||
| @@ -1580,14 +1580,14 @@ namespace OpenSim.Region.PhysicsModule.ubOde | |||
| 1580 | 1580 | ||
| 1581 | int ncolisions = CollisionEventsThisFrame.m_objCollisionList.Count; | 1581 | int ncolisions = CollisionEventsThisFrame.m_objCollisionList.Count; |
| 1582 | 1582 | ||
| 1583 | // if (!SentEmptyCollisionsEvent || ncolisions > 0) | 1583 | if (!SentEmptyCollisionsEvent || ncolisions > 0) |
| 1584 | { | 1584 | { |
| 1585 | base.SendCollisionUpdate(CollisionEventsThisFrame); | 1585 | base.SendCollisionUpdate(CollisionEventsThisFrame); |
| 1586 | 1586 | ||
| 1587 | if (ncolisions == 0) | 1587 | if (ncolisions == 0) |
| 1588 | { | 1588 | { |
| 1589 | SentEmptyCollisionsEvent = true; | 1589 | SentEmptyCollisionsEvent = true; |
| 1590 | // _parent_scene.RemoveCollisionEventReporting(this); | 1590 | _parent_scene.RemoveCollisionEventReporting(this); |
| 1591 | } | 1591 | } |
| 1592 | else | 1592 | else |
| 1593 | { | 1593 | { |