diff options
author | Justin Clark-Casey (justincc) | 2012-05-26 01:55:35 +0100 |
---|---|---|
committer | Justin Clark-Casey (justincc) | 2012-05-26 01:55:35 +0100 |
commit | 43a6f286209e87ebaeabc9e1f966444fa2fac18e (patch) | |
tree | e464dae5cbc8cc40ca5fc88e7dfd21f32e5d4997 /OpenSim/Region/Framework | |
parent | Add Blake/Techplex to CONTRIBUTORS. Thanks! (diff) | |
download | opensim-SC_OLD-43a6f286209e87ebaeabc9e1f966444fa2fac18e.zip opensim-SC_OLD-43a6f286209e87ebaeabc9e1f966444fa2fac18e.tar.gz opensim-SC_OLD-43a6f286209e87ebaeabc9e1f966444fa2fac18e.tar.bz2 opensim-SC_OLD-43a6f286209e87ebaeabc9e1f966444fa2fac18e.tar.xz |
If restating a region, clean up the physics scene after the main scene has been closed not before.
If this is done before then on ODE agent update calls still incoming can fail as they try to use a raycastmanager that has been disposed.
Bullet plugin does nothing on Dispose()
However, I wouldn't be at all surprised if individual region restarting was buggy in lots of other areas.
Diffstat (limited to 'OpenSim/Region/Framework')
-rw-r--r-- | OpenSim/Region/Framework/Scenes/Scene.cs | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs index 98a75e4..ce386be 100644 --- a/OpenSim/Region/Framework/Scenes/Scene.cs +++ b/OpenSim/Region/Framework/Scenes/Scene.cs | |||
@@ -1032,13 +1032,13 @@ namespace OpenSim.Region.Framework.Scenes | |||
1032 | } | 1032 | } |
1033 | } | 1033 | } |
1034 | 1034 | ||
1035 | m_log.Error("[REGION]: Closing"); | ||
1036 | Close(); | ||
1037 | |||
1035 | if (PhysicsScene != null) | 1038 | if (PhysicsScene != null) |
1036 | { | 1039 | { |
1037 | PhysicsScene.Dispose(); | 1040 | PhysicsScene.Dispose(); |
1038 | } | 1041 | } |
1039 | |||
1040 | m_log.Error("[REGION]: Closing"); | ||
1041 | Close(); | ||
1042 | 1042 | ||
1043 | m_log.Error("[REGION]: Firing Region Restart Message"); | 1043 | m_log.Error("[REGION]: Firing Region Restart Message"); |
1044 | 1044 | ||