diff options
| author | Justin Clark-Casey (justincc) | 2012-07-27 00:30:04 +0100 |
|---|---|---|
| committer | Justin Clark-Casey (justincc) | 2012-07-27 00:30:04 +0100 |
| commit | 5f741143fd328e8b13b512d9cc611178433eaef7 (patch) | |
| tree | 06f919ea81fdd26918f64fc50521b0dc0ffedd40 /OpenSim/Region/Framework/Scenes | |
| parent | Fix issue where RegionCombinerModule was not removing regions from its dictio... (diff) | |
| parent | BulletSim: fix a recursive loop when fetching the mass of the root of a linkset. (diff) | |
| download | opensim-SC_OLD-5f741143fd328e8b13b512d9cc611178433eaef7.zip opensim-SC_OLD-5f741143fd328e8b13b512d9cc611178433eaef7.tar.gz opensim-SC_OLD-5f741143fd328e8b13b512d9cc611178433eaef7.tar.bz2 opensim-SC_OLD-5f741143fd328e8b13b512d9cc611178433eaef7.tar.xz | |
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
Diffstat (limited to 'OpenSim/Region/Framework/Scenes')
| -rw-r--r-- | OpenSim/Region/Framework/Scenes/Scene.cs | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs index 24f62e3..1734704 100644 --- a/OpenSim/Region/Framework/Scenes/Scene.cs +++ b/OpenSim/Region/Framework/Scenes/Scene.cs | |||
| @@ -1222,6 +1222,15 @@ namespace OpenSim.Region.Framework.Scenes | |||
| 1222 | 1222 | ||
| 1223 | m_sceneGraph.Close(); | 1223 | m_sceneGraph.Close(); |
| 1224 | 1224 | ||
| 1225 | if (PhysicsScene != null) | ||
| 1226 | { | ||
| 1227 | PhysicsScene phys = PhysicsScene; | ||
| 1228 | // remove the physics engine from both Scene and SceneGraph | ||
| 1229 | PhysicsScene = null; | ||
| 1230 | phys.Dispose(); | ||
| 1231 | phys = null; | ||
| 1232 | } | ||
| 1233 | |||
| 1225 | if (!GridService.DeregisterRegion(RegionInfo.RegionID)) | 1234 | if (!GridService.DeregisterRegion(RegionInfo.RegionID)) |
| 1226 | m_log.WarnFormat("[SCENE]: Deregister from grid failed for region {0}", Name); | 1235 | m_log.WarnFormat("[SCENE]: Deregister from grid failed for region {0}", Name); |
| 1227 | 1236 | ||