diff options
| author | Justin Clark-Casey (justincc) | 2012-11-23 01:01:39 +0000 |
|---|---|---|
| committer | Justin Clark-Casey (justincc) | 2012-11-23 01:01:39 +0000 |
| commit | 61808d148e963ae59e4a3b5a99cdafff7bcb29c0 (patch) | |
| tree | e9f942ad577c87afb66ec577a81739899abbd8e6 /OpenSim | |
| parent | Rename BulletSim's PhysicsShapeType to BSPhysicsShapeType because it (diff) | |
| download | opensim-SC_OLD-61808d148e963ae59e4a3b5a99cdafff7bcb29c0.zip opensim-SC_OLD-61808d148e963ae59e4a3b5a99cdafff7bcb29c0.tar.gz opensim-SC_OLD-61808d148e963ae59e4a3b5a99cdafff7bcb29c0.tar.bz2 opensim-SC_OLD-61808d148e963ae59e4a3b5a99cdafff7bcb29c0.tar.xz | |
Fix regression where we stopped closing scenes on simulator exit.
If we don't do this, then these scenes don't get deregistered from the grid, amongst other things.
Regression was introduced in commit 8c130bc (Mon Nov 12 22:50:28 2012 +0000)
Diffstat (limited to 'OpenSim')
| -rw-r--r-- | OpenSim/Region/Framework/Scenes/SceneManager.cs | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/OpenSim/Region/Framework/Scenes/SceneManager.cs b/OpenSim/Region/Framework/Scenes/SceneManager.cs index 9bd27d3..1c236db 100644 --- a/OpenSim/Region/Framework/Scenes/SceneManager.cs +++ b/OpenSim/Region/Framework/Scenes/SceneManager.cs | |||
| @@ -141,6 +141,13 @@ namespace OpenSim.Region.Framework.Scenes | |||
| 141 | 141 | ||
| 142 | public void Close() | 142 | public void Close() |
| 143 | { | 143 | { |
| 144 | lock (m_localScenes) | ||
| 145 | { | ||
| 146 | for (int i = 0; i < m_localScenes.Count; i++) | ||
| 147 | { | ||
| 148 | m_localScenes[i].Close(); | ||
| 149 | } | ||
| 150 | } | ||
| 144 | } | 151 | } |
| 145 | 152 | ||
| 146 | public void Close(Scene cscene) | 153 | public void Close(Scene cscene) |