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.
integration
Justin Clark-Casey (justincc) 2012-10-25 23:47:13 +01:00
parent b4923da334
commit dc17cee044
1 changed files with 6 additions and 0 deletions

View File

@ -1267,6 +1267,12 @@ namespace OpenSim.Region.Framework.Scenes
// This is the method that shuts down the scene.
public override void Close()
{
if (m_shuttingDown)
{
m_log.WarnFormat("[SCENE]: Ignoring close request because already closing {0}", Name);
return;
}
m_log.InfoFormat("[SCENE]: Closing down the single simulator: {0}", RegionInfo.RegionName);
StatsReporter.Close();