From 7c824f02b445579c0ef54a2212f851ae811a639d Mon Sep 17 00:00:00 2001
From: Melanie
Date: Sat, 28 Jan 2012 22:19:10 +0100
Subject: Add the ability to abort a pending restart using the viewer UI or a
 RemoteAdmin message

---
 OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs | 6 ++++++
 OpenSim/Region/CoreModules/World/Region/RestartModule.cs          | 3 +++
 2 files changed, 9 insertions(+)

(limited to 'OpenSim/Region/CoreModules')

diff --git a/OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs b/OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs
index 161cf82..d5e3314 100644
--- a/OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs
+++ b/OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs
@@ -256,6 +256,12 @@ namespace OpenSim.Region.CoreModules.World.Estate
             IRestartModule restartModule = Scene.RequestModuleInterface<IRestartModule>();
             if (restartModule != null)
             {
+                if (timeInSeconds == -1)
+                {
+                    restartModule.AbortRestart("Restart aborted by region manager");
+                    return;
+                }
+
                 List<int> times = new List<int>();
                 while (timeInSeconds > 0)
                 {
diff --git a/OpenSim/Region/CoreModules/World/Region/RestartModule.cs b/OpenSim/Region/CoreModules/World/Region/RestartModule.cs
index 7f6f4df..86821c6 100644
--- a/OpenSim/Region/CoreModules/World/Region/RestartModule.cs
+++ b/OpenSim/Region/CoreModules/World/Region/RestartModule.cs
@@ -240,6 +240,9 @@ namespace OpenSim.Region.CoreModules.World.Region
                 if (m_DialogModule != null && message != String.Empty)
                     m_DialogModule.SendGeneralAlert(message);
             }
+           if (m_MarkerPath != String.Empty)
+               File.Delete(Path.Combine(m_MarkerPath,
+                       m_Scene.RegionInfo.RegionID.ToString()));
         }
         
         private void HandleRegionRestart(string module, string[] args)
-- 
cgit v1.1