diff options
Merge branch 'careminster-presence-refactor' of ssh://3dhosting.de/var/git/careminster into careminster-presence-refactor
Diffstat (limited to 'OpenSim/Region/Physics')
| -rw-r--r-- | OpenSim/Region/Physics/ChOdePlugin/OdePlugin.cs | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/OpenSim/Region/Physics/ChOdePlugin/OdePlugin.cs b/OpenSim/Region/Physics/ChOdePlugin/OdePlugin.cs index 88f9658..a622745 100644 --- a/OpenSim/Region/Physics/ChOdePlugin/OdePlugin.cs +++ b/OpenSim/Region/Physics/ChOdePlugin/OdePlugin.cs | |||
| @@ -1553,7 +1553,8 @@ namespace OpenSim.Region.Physics.OdePlugin | |||
| 1553 | removeprims = new List<OdePrim>(); | 1553 | removeprims = new List<OdePrim>(); |
| 1554 | } | 1554 | } |
| 1555 | removeprims.Add(chr); | 1555 | removeprims.Add(chr); |
| 1556 | m_log.Debug("[PHYSICS]: unable to collide test active prim against space. The space was zero, the geom was zero or it was in the process of being removed. Removed it from the active prim list. This needs to be fixed!"); | 1556 | /// Commented this because it triggers on every bullet |
| 1557 | //m_log.Debug("[PHYSICS]: unable to collide test active prim against space. The space was zero, the geom was zero or it was in the process of being removed. Removed it from the active prim list. This needs to be fixed!"); | ||
| 1557 | } | 1558 | } |
| 1558 | } | 1559 | } |
| 1559 | } | 1560 | } |