Merge branch 'master' into vehicles

1 files changed, 10 insertions, 0 deletions

diff --git a/OpenSim/Region/Physics/OdePlugin/OdePlugin.cs b/OpenSim/Region/Physics/OdePlugin/OdePlugin.cs
index 9429544..0a065be 100644
--- a/OpenSim/Region/Physics/OdePlugin/OdePlugin.cs
+++ b/OpenSim/Region/Physics/OdePlugin/OdePlugin.cs
@@ -1665,6 +1665,8 @@ namespace OpenSim.Region.Physics.OdePlugin
                 if (!_characters.Contains(chr))
                 {
                     _characters.Add(chr);
+                    if (chr.bad)
+                        m_log.DebugFormat("[PHYSICS] Added BAD actor {0} to characters list", chr.m_uuid);
                 }
             }
         }
@@ -2587,7 +2589,11 @@ namespace OpenSim.Region.Physics.OdePlugin
                 lock (_taintedActors)
                 {
                     if (!(_taintedActors.Contains(taintedchar)))
+                    {
                         _taintedActors.Add(taintedchar);
+                        if (taintedchar.bad)
+                            m_log.DebugFormat("[PHYSICS]: Added BAD actor {0} to tainted actors", taintedchar.m_uuid);
+                    }
                 }
             }
         }
@@ -2992,7 +2998,11 @@ namespace OpenSim.Region.Physics.OdePlugin
                     foreach (OdeCharacter actor in _characters)
                     {
                         if (actor != null)
+                        {
+                            if (actor.bad)
+                                m_log.WarnFormat("[PHYSICS]: BAD Actor {0} in _characters list was not removed?", actor.m_uuid);
                             actor.UpdatePositionAndVelocity();
+                        }
                     }
                 }