aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework
diff options
context:
space:
mode:
authorJustin Clark-Casey (justincc)2012-10-25 23:47:13 +0100
committerJustin Clark-Casey (justincc)2012-10-25 23:47:55 +0100
commitdc17cee044e0d2d17e8152eb31829c3ad5a99359 (patch)
tree666abdc8ac97c1aa3fcbff9bf4bdb9a6918404b2 /OpenSim/Region/Framework
parentChanged "course" to "coarse" in several places (diff)
downloadopensim-SC_OLD-dc17cee044e0d2d17e8152eb31829c3ad5a99359.zip
opensim-SC_OLD-dc17cee044e0d2d17e8152eb31829c3ad5a99359.tar.gz
opensim-SC_OLD-dc17cee044e0d2d17e8152eb31829c3ad5a99359.tar.bz2
opensim-SC_OLD-dc17cee044e0d2d17e8152eb31829c3ad5a99359.tar.xz
minor: if a scene is already shutting down on Scene.Close(), warn and exit instead of attempting to run another shutdown concurrently.
Thanks to Oren Hurvitz for this change.
Diffstat (limited to 'OpenSim/Region/Framework')
-rw-r--r--OpenSim/Region/Framework/Scenes/Scene.cs6
1 files changed, 6 insertions, 0 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs
index d48dc11..0f39671 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.cs
@@ -1267,6 +1267,12 @@ namespace OpenSim.Region.Framework.Scenes
1267 // This is the method that shuts down the scene. 1267 // This is the method that shuts down the scene.
1268 public override void Close() 1268 public override void Close()
1269 { 1269 {
1270 if (m_shuttingDown)
1271 {
1272 m_log.WarnFormat("[SCENE]: Ignoring close request because already closing {0}", Name);
1273 return;
1274 }
1275
1270 m_log.InfoFormat("[SCENE]: Closing down the single simulator: {0}", RegionInfo.RegionName); 1276 m_log.InfoFormat("[SCENE]: Closing down the single simulator: {0}", RegionInfo.RegionName);
1271 1277
1272 StatsReporter.Close(); 1278 StatsReporter.Close();