OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

When regions are set to shut down the instance, always send notifications to 

all affected regions and disregard the region id parameter.
avinationmerge
Melanie 2012-06-03 13:43:39 +02:00
parent 928e3e9e21
commit 207a5f17b5
1 changed files with 30 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs
View File

@ -258,10 +258,25 @@ namespace OpenSim.ApplicationPlugins.RemoteController
{ {
m_log.Info("[RADMIN]: Request to restart Region."); m_log.Info("[RADMIN]: Request to restart Region.");
CheckRegionParams(requestData, responseData);
Scene rebootedScene = null; Scene rebootedScene = null;
GetSceneFromRegionParams(requestData, responseData, out rebootedScene); bool restartAll = false;
IConfig startupConfig = m_configSource.Configs["Startup"];
if (startupConfig != null)
{
if (startupConfig.GetBoolean("InworldRestartShutsDown", false))
{
rebootedScene = m_application.SceneManager.CurrentOrFirstScene;
restartAll = true;
}
}
if (rebootedScene == null)
{
CheckRegionParams(requestData, responseData);
GetSceneFromRegionParams(requestData, responseData, out rebootedScene);
}
IRestartModule restartModule = rebootedScene.RequestModuleInterface<IRestartModule>(); IRestartModule restartModule = rebootedScene.RequestModuleInterface<IRestartModule>();
@ -324,11 +339,20 @@ namespace OpenSim.ApplicationPlugins.RemoteController
notice = false; notice = false;
} }
if (restartModule != null) List<Scene> restartList;
if (restartAll)
restartList = m_application.SceneManager.Scenes;
else
restartList = new List<Scene>() { rebootedScene };
foreach (Scene s in m_application.SceneManager.Scenes)
{ {
restartModule.ScheduleRestart(UUID.Zero, message, times.ToArray(), notice); restartModule = s.RequestModuleInterface<IRestartModule>();
responseData["success"] = true; if (restartModule != null)
restartModule.ScheduleRestart(UUID.Zero, message, times.ToArray(), notice);
} }
responseData["success"] = true;
} }
catch (Exception e) catch (Exception e)
{ {