diff options
author | Diva Canto | 2015-10-14 09:56:23 -0700 |
---|---|---|
committer | Diva Canto | 2015-10-14 09:56:23 -0700 |
commit | 45b8e6c1a7282f6a7e32c0a51562927f9e9f04a4 (patch) | |
tree | 0115d01e50de480332ffd4c5ac4ccfe8f4fc339a /OpenSim/Region/PhysicsModules | |
parent | fix a typo.. (diff) | |
download | opensim-SC_OLD-45b8e6c1a7282f6a7e32c0a51562927f9e9f04a4.zip opensim-SC_OLD-45b8e6c1a7282f6a7e32c0a51562927f9e9f04a4.tar.gz opensim-SC_OLD-45b8e6c1a7282f6a7e32c0a51562927f9e9f04a4.tar.bz2 opensim-SC_OLD-45b8e6c1a7282f6a7e32c0a51562927f9e9f04a4.tar.xz |
Fixed exception upon shutting down in plain ODE.
09:49:57 - [SHUTDOWN]: Ignoring failure during shutdown - System.NullReferenceException: Object reference not set to an instance of an object.
at OpenSim.Region.PhysicsModule.ODE.OdeScene.Dispose() in f:\dev\opensim-core\OpenSim\Region\PhysicsModules\Ode\OdeScene.cs:line 4062
Diffstat (limited to 'OpenSim/Region/PhysicsModules')
-rw-r--r-- | OpenSim/Region/PhysicsModules/Ode/OdeScene.cs | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/OpenSim/Region/PhysicsModules/Ode/OdeScene.cs b/OpenSim/Region/PhysicsModules/Ode/OdeScene.cs index 144d762..adc8d98 100644 --- a/OpenSim/Region/PhysicsModules/Ode/OdeScene.cs +++ b/OpenSim/Region/PhysicsModules/Ode/OdeScene.cs | |||
@@ -4059,8 +4059,11 @@ namespace OpenSim.Region.PhysicsModule.ODE | |||
4059 | { | 4059 | { |
4060 | _worldInitialized = false; | 4060 | _worldInitialized = false; |
4061 | 4061 | ||
4062 | m_rayCastManager.Dispose(); | 4062 | if (m_rayCastManager != null) |
4063 | m_rayCastManager = null; | 4063 | { |
4064 | m_rayCastManager.Dispose(); | ||
4065 | m_rayCastManager = null; | ||
4066 | } | ||
4064 | 4067 | ||
4065 | lock (OdeLock) | 4068 | lock (OdeLock) |
4066 | { | 4069 | { |