Merge commit '30fe66d3ab534422407415817b570a66096c543b' into bigmerge

2011-10-25 03:18:04 +01:00 · 2011-10-25 03:18:04 +01:00 · 564563d273
parent 6d4480c1ca 30fe66d3ab
commit 564563d273
1 changed files with 0 additions and 3 deletions
--- a/OpenSim/Region/Physics/OdePlugin/OdeScene.cs
+++ b/OpenSim/Region/Physics/OdePlugin/OdeScene.cs
@ -2793,9 +2793,6 @@ Console.WriteLine("AddPhysicsActorTaint to " + taintedprim.Name);
                        {
                            foreach (PhysicsActor obj in _collisionEventPrim)
                            {
-                                if (obj == null)
-                                    continue;
-
 //                                m_log.DebugFormat("[PHYSICS]: Assessing {0} for collision events", obj.SOPName);

                                switch ((ActorTypes)obj.PhysicsActorType)