From 65c0c4be7863a25719e6e404b0d5a002829f8caf Mon Sep 17 00:00:00 2001
From: Melanie Thielker
Date: Mon, 23 Mar 2015 22:19:33 +0100
Subject: Allow re-setting the region restart timer. Also move restart
 notifications to upper right corner again.

---
 OpenSim/Region/CoreModules/World/Region/RestartModule.cs | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/OpenSim/Region/CoreModules/World/Region/RestartModule.cs b/OpenSim/Region/CoreModules/World/Region/RestartModule.cs
index 0c74b49..e6a0205 100644
--- a/OpenSim/Region/CoreModules/World/Region/RestartModule.cs
+++ b/OpenSim/Region/CoreModules/World/Region/RestartModule.cs
@@ -131,7 +131,10 @@ namespace OpenSim.Region.CoreModules.World.Region
         public void ScheduleRestart(UUID initiator, string message, int[] alerts, bool notice)
         {
             if (m_CountdownTimer != null)
-                return;
+            {
+                m_CountdownTimer.Stop();
+                m_CountdownTimer = null;
+            }
 
             if (alerts == null)
             {
@@ -276,7 +279,8 @@ namespace OpenSim.Region.CoreModules.World.Region
                 m_CountdownTimer.Stop();
                 m_CountdownTimer = null;
                 if (m_DialogModule != null && message != String.Empty)
-                    m_DialogModule.SendGeneralAlert(message);
+                    m_DialogModule.SendNotificationToUsersInRegion(UUID.Zero, "System", message);
+                    //m_DialogModule.SendGeneralAlert(message);
             }
             if (m_MarkerPath != String.Empty)
                 File.Delete(Path.Combine(m_MarkerPath,
-- 
cgit v1.1