diff options
| author | Melanie Thielker | 2008-11-19 20:04:41 +0000 |
|---|---|---|
| committer | Melanie Thielker | 2008-11-19 20:04:41 +0000 |
| commit | 6f0e068cf18aa17ecbcc704ad957f6311727875c (patch) | |
| tree | abb207add4ed6d288922d2ce2d30af04d2196ede /OpenSim/Region | |
| parent | Mantis#2638. Thank you kindly, Sacha Magne for a patch that: (diff) | |
| download | opensim-SC_OLD-6f0e068cf18aa17ecbcc704ad957f6311727875c.zip opensim-SC_OLD-6f0e068cf18aa17ecbcc704ad957f6311727875c.tar.gz opensim-SC_OLD-6f0e068cf18aa17ecbcc704ad957f6311727875c.tar.bz2 opensim-SC_OLD-6f0e068cf18aa17ecbcc704ad957f6311727875c.tar.xz | |
Guard against a strange nullref in ODE
Diffstat (limited to 'OpenSim/Region')
| -rw-r--r-- | OpenSim/Region/Physics/OdePlugin/OdePlugin.cs | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/OpenSim/Region/Physics/OdePlugin/OdePlugin.cs b/OpenSim/Region/Physics/OdePlugin/OdePlugin.cs index 84bf54f..9da49f7 100644 --- a/OpenSim/Region/Physics/OdePlugin/OdePlugin.cs +++ b/OpenSim/Region/Physics/OdePlugin/OdePlugin.cs | |||
| @@ -1099,6 +1099,11 @@ namespace OpenSim.Region.Physics.OdePlugin | |||
| 1099 | // Reset the collision values to false | 1099 | // Reset the collision values to false |
| 1100 | // since we don't know if we're colliding yet | 1100 | // since we don't know if we're colliding yet |
| 1101 | 1101 | ||
| 1102 | // For some reason this can happen. Don't ask... | ||
| 1103 | // | ||
| 1104 | if (chr == null) | ||
| 1105 | continue; | ||
| 1106 | |||
| 1102 | chr.IsColliding = false; | 1107 | chr.IsColliding = false; |
| 1103 | chr.CollidingGround = false; | 1108 | chr.CollidingGround = false; |
| 1104 | chr.CollidingObj = false; | 1109 | chr.CollidingObj = false; |