diff options
author | UbitUmarov | 2015-11-27 14:01:42 +0000 |
---|---|---|
committer | UbitUmarov | 2015-11-27 14:01:42 +0000 |
commit | bb0db96256eb5e6fbadb2c1084196208529f883d (patch) | |
tree | 3f5d9a58a2be0302c8bd7afb96daaa95894aa68c /OpenSim | |
parent | change Backup on scene close to Forced, and not dependent on last change time. (diff) | |
download | opensim-SC_OLD-bb0db96256eb5e6fbadb2c1084196208529f883d.zip opensim-SC_OLD-bb0db96256eb5e6fbadb2c1084196208529f883d.tar.gz opensim-SC_OLD-bb0db96256eb5e6fbadb2c1084196208529f883d.tar.bz2 opensim-SC_OLD-bb0db96256eb5e6fbadb2c1084196208529f883d.tar.xz |
DeregisterRegion from grid earlier on close
Diffstat (limited to 'OpenSim')
-rwxr-xr-x | 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 cf84e2e..8bdf39a 100755 --- a/OpenSim/Region/Framework/Scenes/Scene.cs +++ b/OpenSim/Region/Framework/Scenes/Scene.cs | |||
@@ -1481,11 +1481,14 @@ namespace OpenSim.Region.Framework.Scenes | |||
1481 | 1481 | ||
1482 | m_log.InfoFormat("[SCENE]: Closing down the single simulator: {0}", RegionInfo.RegionName); | 1482 | m_log.InfoFormat("[SCENE]: Closing down the single simulator: {0}", RegionInfo.RegionName); |
1483 | 1483 | ||
1484 | StatsReporter.Close(); | ||
1485 | 1484 | ||
1485 | StatsReporter.Close(); | ||
1486 | m_restartTimer.Stop(); | 1486 | m_restartTimer.Stop(); |
1487 | m_restartTimer.Close(); | 1487 | m_restartTimer.Close(); |
1488 | 1488 | ||
1489 | if (!GridService.DeregisterRegion(RegionInfo.RegionID)) | ||
1490 | m_log.WarnFormat("[SCENE]: Deregister from grid failed for region {0}", Name); | ||
1491 | |||
1489 | // Kick all ROOT agents with the message, 'The simulator is going down' | 1492 | // Kick all ROOT agents with the message, 'The simulator is going down' |
1490 | ForEachScenePresence(delegate(ScenePresence avatar) | 1493 | ForEachScenePresence(delegate(ScenePresence avatar) |
1491 | { | 1494 | { |
@@ -1516,9 +1519,6 @@ namespace OpenSim.Region.Framework.Scenes | |||
1516 | 1519 | ||
1517 | m_sceneGraph.Close(); | 1520 | m_sceneGraph.Close(); |
1518 | 1521 | ||
1519 | if (!GridService.DeregisterRegion(RegionInfo.RegionID)) | ||
1520 | m_log.WarnFormat("[SCENE]: Deregister from grid failed for region {0}", Name); | ||
1521 | |||
1522 | base.Close(); | 1522 | base.Close(); |
1523 | 1523 | ||
1524 | // XEngine currently listens to the EventManager.OnShutdown event to trigger script stop and persistence. | 1524 | // XEngine currently listens to the EventManager.OnShutdown event to trigger script stop and persistence. |