diff options
| author | Melanie | 2011-10-25 03:18:04 +0100 |
|---|---|---|
| committer | Melanie | 2011-10-25 03:18:04 +0100 |
| commit | 564563d273fc804b239d2ec4951d37940e865a1b (patch) | |
| tree | b1b5d672f33d38fb1d61d5aa9799f6110b2dc6f3 /OpenSim/Region | |
| parent | Merge commit '9c430208769ab7fd7877093e278e8fcae02ecef3' into bigmerge (diff) | |
| parent | remove unnecessary null check on _collisionEventPrim (diff) | |
| download | opensim-SC-564563d273fc804b239d2ec4951d37940e865a1b.zip opensim-SC-564563d273fc804b239d2ec4951d37940e865a1b.tar.gz opensim-SC-564563d273fc804b239d2ec4951d37940e865a1b.tar.bz2 opensim-SC-564563d273fc804b239d2ec4951d37940e865a1b.tar.xz | |
Merge commit '30fe66d3ab534422407415817b570a66096c543b' into bigmerge
Diffstat (limited to 'OpenSim/Region')
| -rw-r--r-- | OpenSim/Region/Physics/OdePlugin/OdeScene.cs | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/OpenSim/Region/Physics/OdePlugin/OdeScene.cs b/OpenSim/Region/Physics/OdePlugin/OdeScene.cs index 1d0c699..09bccf9 100644 --- a/OpenSim/Region/Physics/OdePlugin/OdeScene.cs +++ b/OpenSim/Region/Physics/OdePlugin/OdeScene.cs | |||
| @@ -2793,9 +2793,6 @@ Console.WriteLine("AddPhysicsActorTaint to " + taintedprim.Name); | |||
| 2793 | { | 2793 | { |
| 2794 | foreach (PhysicsActor obj in _collisionEventPrim) | 2794 | foreach (PhysicsActor obj in _collisionEventPrim) |
| 2795 | { | 2795 | { |
| 2796 | if (obj == null) | ||
| 2797 | continue; | ||
| 2798 | |||
| 2799 | // m_log.DebugFormat("[PHYSICS]: Assessing {0} for collision events", obj.SOPName); | 2796 | // m_log.DebugFormat("[PHYSICS]: Assessing {0} for collision events", obj.SOPName); |
| 2800 | 2797 | ||
| 2801 | switch ((ActorTypes)obj.PhysicsActorType) | 2798 | switch ((ActorTypes)obj.PhysicsActorType) |