diff options
| author | Justin Clark-Casey (justincc) | 2012-11-23 02:22:30 +0000 |
|---|---|---|
| committer | Justin Clark-Casey (justincc) | 2012-11-23 02:22:30 +0000 |
| commit | 8c8c8a00a47b61fcfd4a500ac8f13aa1aafaad26 (patch) | |
| tree | fbaa01d3747e741d3384603b77c72813b2aa8b86 /OpenSim/Region/Framework/Scenes/Scene.cs | |
| parent | Add regression test for checking scene close when SceneManager is asked to close (diff) | |
| download | opensim-SC_OLD-8c8c8a00a47b61fcfd4a500ac8f13aa1aafaad26.zip opensim-SC_OLD-8c8c8a00a47b61fcfd4a500ac8f13aa1aafaad26.tar.gz opensim-SC_OLD-8c8c8a00a47b61fcfd4a500ac8f13aa1aafaad26.tar.bz2 opensim-SC_OLD-8c8c8a00a47b61fcfd4a500ac8f13aa1aafaad26.tar.xz | |
Fix problem where restarting the currently selected region would stop various console commands (e.g. "show users") from working.
This was because the "currently selected" scene reference was being left as the dead scene instead of the restarted Scene object.
Diffstat (limited to 'OpenSim/Region/Framework/Scenes/Scene.cs')
| -rw-r--r-- | OpenSim/Region/Framework/Scenes/Scene.cs | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs index db45d6b..8ef22bd 100644 --- a/OpenSim/Region/Framework/Scenes/Scene.cs +++ b/OpenSim/Region/Framework/Scenes/Scene.cs | |||
| @@ -1134,15 +1134,9 @@ namespace OpenSim.Region.Framework.Scenes | |||
| 1134 | } | 1134 | } |
| 1135 | } | 1135 | } |
| 1136 | 1136 | ||
| 1137 | m_log.Error("[REGION]: Closing"); | 1137 | m_log.InfoFormat("[REGION]: Restarting region {0}", Name); |
| 1138 | Close(); | ||
| 1139 | 1138 | ||
| 1140 | if (PhysicsScene != null) | 1139 | Close(); |
| 1141 | { | ||
| 1142 | PhysicsScene.Dispose(); | ||
| 1143 | } | ||
| 1144 | |||
| 1145 | m_log.Error("[REGION]: Firing Region Restart Message"); | ||
| 1146 | 1140 | ||
| 1147 | base.Restart(); | 1141 | base.Restart(); |
| 1148 | } | 1142 | } |