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/Framework/Scenes/ScenePresence.cs | |
| parent | Fix a missing locking call (diff) | |
| parent | Merge branch 'master' into bigmerge (diff) | |
| download | opensim-SC_OLD-c763419043773c93dbbc865ec35f7ecf856a641a.zip opensim-SC_OLD-c763419043773c93dbbc865ec35f7ecf856a641a.tar.gz opensim-SC_OLD-c763419043773c93dbbc865ec35f7ecf856a641a.tar.bz2 opensim-SC_OLD-c763419043773c93dbbc865ec35f7ecf856a641a.tar.xz | |
Merge branch 'bigmerge' of ssh://3dhosting.de/var/git/careminster into bigmerge
Diffstat (limited to 'OpenSim/Region/Framework/Scenes/ScenePresence.cs')
| -rw-r--r-- | OpenSim/Region/Framework/Scenes/ScenePresence.cs | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs index 9970763..0f13050 100644 --- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs +++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs | |||
| @@ -3649,9 +3649,6 @@ namespace OpenSim.Region.Framework.Scenes | |||
| 3649 | // Event called by the physics plugin to tell the avatar about a collision. | 3649 | // Event called by the physics plugin to tell the avatar about a collision. |
| 3650 | private void PhysicsCollisionUpdate(EventArgs e) | 3650 | private void PhysicsCollisionUpdate(EventArgs e) |
| 3651 | { | 3651 | { |
| 3652 | if (e == null) | ||
| 3653 | return; | ||
| 3654 | |||
| 3655 | //if ((Math.Abs(Velocity.X) > 0.1e-9f) || (Math.Abs(Velocity.Y) > 0.1e-9f)) | 3652 | //if ((Math.Abs(Velocity.X) > 0.1e-9f) || (Math.Abs(Velocity.Y) > 0.1e-9f)) |
| 3656 | // The Physics Scene will send updates every 500 ms grep: PhysicsActor.SubscribeEvents( | 3653 | // The Physics Scene will send updates every 500 ms grep: PhysicsActor.SubscribeEvents( |
| 3657 | // as of this comment the interval is set in AddToPhysicalScene | 3654 | // as of this comment the interval is set in AddToPhysicalScene |